Skip to content

Commit

Permalink
Upgrade Mx8
Browse files Browse the repository at this point in the history
  • Loading branch information
pimvdnoll committed Feb 25, 2021
1 parent 34280ee commit fa5140a
Show file tree
Hide file tree
Showing 666 changed files with 35,732 additions and 18,080 deletions.
4 changes: 2 additions & 2 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="javasource"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="C:/Program Files/Mendix/7.3.0/runtime/bundles/biz.aQute.bnd.bndlib.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.3.0/runtime/bundles/com.mendix.json.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.3.0/runtime/bundles/com.mendix.logging-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.3.0/runtime/bundles/com.mendix.m2ee-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.3.0/runtime/bundles/com.mendix.public-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.3.0/runtime/bundles/javax.servlet.jar"/>
<classpathentry kind="lib" path="userlib/antisamy-1.5.3.jar"/><classpathentry kind="lib" path="userlib/axiom-api-1.2.12.jar"/><classpathentry kind="lib" path="userlib/com.google.guava-14.0.1.jar"/><classpathentry kind="lib" path="userlib/com.springsource.org.apache.batik.css-1.7.0.jar"/><classpathentry kind="lib" path="userlib/commons-codec-1.10.jar"/><classpathentry kind="lib" path="userlib/commons-httpclient-3.1.jar"/><classpathentry kind="lib" path="userlib/commons-lang-2.5.jar"/><classpathentry kind="lib" path="userlib/commons-logging-1.1.jar"/><classpathentry kind="lib" path="userlib/guice-2.0.jar"/><classpathentry kind="lib" path="userlib/java-sdk-3.5.3-jar-with-dependencies.jar"/><classpathentry kind="lib" path="userlib/jcifs-1.3.18.jar"/><classpathentry kind="lib" path="userlib/jempbox-1.8.5.jar"/><classpathentry kind="lib" path="userlib/joda-time-2.9.6.jar"/><classpathentry kind="lib" path="userlib/junit-4.11.jar"/><classpathentry kind="lib" path="userlib/nekohtml.jar"/><classpathentry kind="lib" path="userlib/openid4java-0.9.8.jar"/><classpathentry kind="lib" path="userlib/openid4java-1.0.0.jar"/><classpathentry kind="lib" path="userlib/org.apache.commons.fileupload-1.2.1.jar"/><classpathentry kind="lib" path="userlib/org.apache.commons.io-2.3.0.jar"/><classpathentry kind="lib" path="userlib/org.apache.commons.lang3.jar"/><classpathentry kind="lib" path="userlib/org.apache.httpcomponents.httpclient-osgi.jar"/><classpathentry kind="lib" path="userlib/org.apache.httpcomponents.httpclient_4.4.1.jar"/><classpathentry kind="lib" path="userlib/org.apache.httpcomponents.httpcore-osgi.jar"/><classpathentry kind="lib" path="userlib/org.apache.httpcomponents.httpcore_4.4.1.jar"/><classpathentry kind="lib" path="userlib/org.apache.servicemix.bundles.batik.1.8_1.jar"/><classpathentry kind="lib" path="userlib/pdfbox-app-2.0.3.jar"/><classpathentry kind="lib" path="userlib/xerces.xercesImpl.2.8.1.jar"/><classpathentry kind="lib" path="userlib/xml-apis-ext.jar"/>
<classpathentry kind="lib" path="C:/Program Files/Mendix/8.17.0.11170/runtime/bundles/com.mendix.json.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/8.17.0.11170/runtime/bundles/com.mendix.logging-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/8.17.0.11170/runtime/bundles/com.mendix.m2ee-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/8.17.0.11170/runtime/bundles/com.mendix.public-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/8.17.0.11170/runtime/bundles/javax.servlet-api.servlet.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/8.17.0.11170/runtime/bundles/javax.websocket-api.websocket.jar"/>
<classpathentry kind="lib" path="userlib/animal-sniffer-annotations-1.17.jar"/><classpathentry kind="lib" path="userlib/checker-qual-2.5.2.jar"/><classpathentry kind="lib" path="userlib/commons-io-2.6.jar"/><classpathentry kind="lib" path="userlib/commons-lang3-3.7.jar"/><classpathentry kind="lib" path="userlib/commons-logging-1.2.jar"/><classpathentry kind="lib" path="userlib/error_prone_annotations-2.2.0.jar"/><classpathentry kind="lib" path="userlib/fontbox-2.0.13.jar"/><classpathentry kind="lib" path="userlib/guava-27.0-jre.jar"/><classpathentry kind="lib" path="userlib/hamcrest-2.2.jar"/><classpathentry kind="lib" path="userlib/httpclient5-5.0.3.jar"/><classpathentry kind="lib" path="userlib/httpcore5-5.0.3.jar"/><classpathentry kind="lib" path="userlib/j2objc-annotations-1.1.jar"/><classpathentry kind="lib" path="userlib/jsr305-3.0.2.jar"/><classpathentry kind="lib" path="userlib/junit-4.13.1.jar"/><classpathentry kind="lib" path="userlib/owasp-java-html-sanitizer-20181114.1.jar"/><classpathentry kind="lib" path="userlib/pdfbox-2.0.13.jar"/>
<classpathentry kind="output" path="deployment/run/bin"/>
</classpath>
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/deployment/run/bndbuild.launch</value>
<value>&lt;project&gt;/deployment/run/componentbuild.launch</value>
</dictionary>
</arguments>
</buildCommand>
Expand Down
Binary file modified CM BulkSMS.mpr
Binary file not shown.
Binary file removed CM BulkSMS.mpr.bak
Binary file not shown.
File renamed without changes.
33 changes: 0 additions & 33 deletions CM_BulkSMS.launch

This file was deleted.

Binary file removed Output/BulkSMS-v-1-0-3.mpk
Binary file not shown.
Binary file removed Output/BulkSMS-v-1-1-0.mpk
Binary file not shown.
Binary file added Output/BulkSMS-v-2-0-0.mpk
Binary file not shown.
17 changes: 8 additions & 9 deletions cm_mendix_bulksms_plugin.launch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="M2EE_ADMIN_PASS" value="1"/>
<mapEntry key="M2EE_ADMIN_PORT" value="8090"/>
<mapEntry key="M2EE_CONSOLE_PATH" value="C:/Program Files/Mendix/7.3.0/modeler/MendixConsoleLog.exe"/>
<mapEntry key="MX_INSTALL_PATH" value="C:/Program Files/Mendix/7.3.0"/>
<mapEntry key="MXCONSOLE_BASE_PATH" value="D:/Documents/cm-mendix-bulksms-plugin/deployment"/>
<mapEntry key="MXCONSOLE_RUNTIME_PATH" value="C:/Program Files/Mendix/7.3.0/runtime"/>
<mapEntry key="M2EE_CONSOLE_PATH" value="C:/Program Files/Mendix/8.17.0.11170/modeler/MendixConsoleLog.exe"/>
<mapEntry key="MX_INSTALL_PATH" value="C:/Program Files/Mendix/8.17.0.11170"/>
<mapEntry key="MXCONSOLE_BASE_PATH" value="C:/Users/pim/Documents/00_Archive/cm-mendix-bulksms-plugin/deployment"/>
<mapEntry key="MXCONSOLE_RUNTIME_PATH" value="C:/Program Files/Mendix/8.17.0.11170/runtime"/>
<mapEntry key="MXCONSOLE_RUNTIME_PORT" value="8080"/>
<mapEntry key="MXCONSOLE_RUNTIME_LISTEN_ADDRESSES" value="*"/>
<mapEntry key="MXCONSOLE_SERVER_URL" value="http://127.0.0.1:8090/"/>
Expand All @@ -21,13 +21,12 @@
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;cm_mendix_bulksms_plugin&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;cm_mendix_bulksms_plugin&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files/Mendix/7.3.0/runtime/launcher/runtimelauncher.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files/Mendix/7.3.0/runtime/lib/com.mendix.xml-apis-1.4.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files/Mendix/8.17.0.11170/runtime/launcher/runtimelauncher.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.mendix.container.boot.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cm_mendix_bulksms_plugin"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.net.preferIPv4Stack=true -DMX_LOG_LEVEL=INFO -Djava.library.path=&quot;C:/Program Files/Mendix/7.3.0/runtime/lib/x64;D:/Documents/cm-mendix-bulksms-plugin/deployment/model/lib/userlib&quot; -Dfile.encoding=UTF-8 -Djava.io.tmpdir=&quot;D:/Documents/cm-mendix-bulksms-plugin/deployment/data/tmp&quot; -Djava.security.manager -Djava.security.policy==&quot;D:\Documents\cm-mendix-bulksms-plugin\deployment\data\.policy&quot;"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="D:/Documents/cm-mendix-bulksms-plugin/deployment"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="D:/Documents/cm-mendix-bulksms-plugin/deployment"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.net.preferIPv4Stack=true -DMX_LOG_LEVEL=INFO -Djava.library.path=&quot;C:/Program Files/Mendix/8.17.0.11170/runtime/lib/x64;C:/Users/pim/Documents/00_Archive/cm-mendix-bulksms-plugin/deployment/model/lib/userlib&quot; -Dfile.encoding=UTF-8 -Djava.io.tmpdir=&quot;C:/Users/pim/Documents/00_Archive/cm-mendix-bulksms-plugin/deployment/data/tmp&quot;"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="&quot;C:/Users/pim/Documents/00_Archive/cm-mendix-bulksms-plugin/deployment&quot;"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:/Users/pim/Documents/00_Archive/cm-mendix-bulksms-plugin/deployment"/>
</launchConfiguration>
14 changes: 7 additions & 7 deletions javasource/administration/proxies/Account.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file was generated by Mendix Modeler.
// This file was generated by Mendix Studio Pro.
//
// WARNING: Code you write here will be lost the next time you deploy the project.

Expand Down Expand Up @@ -38,7 +38,7 @@ public enum MemberNames
metaName = s;
}

@Override
@java.lang.Override
public java.lang.String toString()
{
return metaName;
Expand All @@ -60,7 +60,7 @@ protected Account(com.mendix.systemwideinterfaces.core.IContext context, com.men
/**
* @deprecated Use 'Account.load(IContext, IMendixIdentifier)' instead.
*/
@Deprecated
@java.lang.Deprecated
public static administration.proxies.Account initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixIdentifier mendixIdentifier) throws com.mendix.core.CoreException
{
return administration.proxies.Account.load(context, mendixIdentifier);
Expand Down Expand Up @@ -197,7 +197,7 @@ public final void setIsLocalUser(com.mendix.systemwideinterfaces.core.IContext c
getMendixObject().setValue(context, MemberNames.IsLocalUser.toString(), islocaluser);
}

@Override
@java.lang.Override
public boolean equals(Object obj)
{
if (obj == this)
Expand All @@ -211,7 +211,7 @@ public boolean equals(Object obj)
return false;
}

@Override
@java.lang.Override
public int hashCode()
{
return getMendixObject().hashCode();
Expand All @@ -229,8 +229,8 @@ public static java.lang.String getType()
* @return String GUID from this object, format: ID_0000000000
* @deprecated Use getMendixObject().getId().toLong() to get a unique identifier for this object.
*/
@Override
@Deprecated
@java.lang.Override
@java.lang.Deprecated
public java.lang.String getGUID()
{
return "ID_" + getMendixObject().getId().toLong();
Expand Down
12 changes: 6 additions & 6 deletions javasource/administration/proxies/AccountPasswordData.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file was generated by Mendix Modeler.
// This file was generated by Mendix Studio Pro.
//
// WARNING: Code you write here will be lost the next time you deploy the project.

Expand Down Expand Up @@ -32,7 +32,7 @@ public enum MemberNames
metaName = s;
}

@Override
@java.lang.Override
public java.lang.String toString()
{
return metaName;
Expand All @@ -58,7 +58,7 @@ protected AccountPasswordData(com.mendix.systemwideinterfaces.core.IContext cont
/**
* @deprecated Use 'AccountPasswordData.load(IContext, IMendixIdentifier)' instead.
*/
@Deprecated
@java.lang.Deprecated
public static administration.proxies.AccountPasswordData initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixIdentifier mendixIdentifier) throws com.mendix.core.CoreException
{
return administration.proxies.AccountPasswordData.load(context, mendixIdentifier);
Expand Down Expand Up @@ -277,7 +277,7 @@ public final com.mendix.systemwideinterfaces.core.IContext getContext()
return context;
}

@Override
@java.lang.Override
public boolean equals(Object obj)
{
if (obj == this)
Expand All @@ -291,7 +291,7 @@ public boolean equals(Object obj)
return false;
}

@Override
@java.lang.Override
public int hashCode()
{
return getMendixObject().hashCode();
Expand All @@ -309,7 +309,7 @@ public static java.lang.String getType()
* @return String GUID from this object, format: ID_0000000000
* @deprecated Use getMendixObject().getId().toLong() to get a unique identifier for this object.
*/
@Deprecated
@java.lang.Deprecated
public java.lang.String getGUID()
{
return "ID_" + getMendixObject().getId().toLong();
Expand Down
Loading

0 comments on commit fa5140a

Please sign in to comment.