minor

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/permission/CdmPermissionClass.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/permission/CdmPermissionClass.java
old mode 100644 (file)
new mode 100755 (executable)
index 3112895..6489eb9
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/permission/CdmPermissionClass.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/permission/CdmPermissionClass.java
@@ -10,6 +10,7 @@ package eu.etaxonomy.cdm.persistence.hibernate.permission;
 \r
 import org.apache.log4j.Logger;\r
 \r
+import eu.etaxonomy.cdm.model.CdmBaseType;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 \r
 /**\r

diff --git a/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp - run.launch b/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp - run.launch
old mode 100644 (file)
new mode 100755 (executable)
index adc883b..1faf8cd
--- a/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp - run.launch
+++ b/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp - run.launch
@@ -56,9 +56,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.eclipsejetty.starter.jetty9.Jetty9LauncherMain"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>\r
-<<<<<<< Updated upstream
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2000M&#13;&#10;-XX:PermSize=150m&#13;&#10;&#13;&#10;-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=true&#13;&#10;-Dspring.profiles.active=remoting"/>\r
-=======
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1000M&#13;&#10;-XX:PermSize=150m&#13;&#10;&#13;&#10;-Dlog4j.configDebug=false&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=true&#13;&#10;-Dspring.profiles.active=remoting"/>\r
->>>>>>> Stashed changes
 </launchConfiguration>\r

diff --git a/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp-unit-test.launch b/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp-unit-test.launch
old mode 100644 (file)
new mode 100755 (executable)
index 2bd5952..e328858
--- a/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp-unit-test.launch
+++ b/cdmlib-remote-webapp/ide/eclipse/Jetty Launcher/cdmlib-remote-webapp-unit-test.launch
@@ -20,7 +20,7 @@
 <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.path.0" value=""/>
 <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.config.type.0" value="DEFAULT"/>
 <booleanAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.embedded" value="false"/>
-<intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.microVersion" value="14"/>
+<intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.microVersion" value="1"/>
 <intAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.minorVersion" value="2"/>
 <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.path" value="C:\Program Files\jetty-distribution-9.2.14.v20151106"/>
 <stringAttribute key="net.sourceforge.eclipsejetty.launcher.jetty.version" value="JETTY_9"/>
@@ -56,5 +56,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.eclipsejetty.starter.jetty9.Jetty9LauncherMain"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M&#13;&#10;-XX:PermSize=150m&#13;&#10;&#13;&#10;-Dlog4j.configDebug=true&#13;&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#13;&#10;&#13;&#10;-Dcdm.forceSchemaUpdate=true&#13;&#10;-Dspring.profiles.active=remoting&#13;&#10;&#13;&#10;-Dcdm.datasource=local-cdmTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M&#10;-XX:PermSize=150m&#10;&#10;-Dlog4j.configDebug=true&#10;-Dlog4j.configuration=file:///${system_property:user.home}/.cdmLibrary/log4j.properties&#10;&#10;-Dcdm.forceSchemaUpdate=true&#10;-Dspring.profiles.active=remoting&#10;&#10;-Dcdm.datasource=local-cdmTest"/>
 </launchConfiguration>

diff --git a/cdmlib-remote-webapp/src/main/resources/log4j.properties b/cdmlib-remote-webapp/src/main/resources/log4j.properties
old mode 100644 (file)
new mode 100755 (executable)