Merge remote-tracking branch 'origin/master' into gui-devel

Evolveum · Jun 22, 2014 · 4888cc8 · 4888cc8
2 parents ac0df57 + 3859d6e
commit 4888cc8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -553,5 +553,31 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>tomcat</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+	    <dependencies>
+		<dependency>
+                        <artifactId>jaxb-impl</artifactId>
+                        <groupId>com.sun.xml.bind</groupId>
+                </dependency>
+                <dependency>
+                        <artifactId>jaxb-api</artifactId>
+                        <groupId>javax.xml.bind</groupId>
+			<version>${jaxb.version}</version>
+                </dependency>
+                <dependency>
+                        <artifactId>jaxb-core</artifactId>
+                        <groupId>com.sun.xml.bind</groupId>
+			<version>${jaxb.version}</version>
+		</dependency>
+	    </dependencies>
+
+        </profile>
+
     </profiles>
 </project>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
@@ -235,14 +235,12 @@ private File[] getInitialImportObjects() {
         	try {
         		File tmpDir = new File(configuration.getMidpointHome()+"/tmp");
         		if (!tmpDir.mkdir()) {
-        			LOGGER.error("Failed to create temporary directory for inital objects {}", configuration.getMidpointHome()+"/tmp");
-        			throw new RuntimeException("Failed to create temporary directory for inital objects " + configuration.getMidpointHome()+"/tmp");
+        			LOGGER.warn("Failed to create temporary directory for inital objects {}. Maybe it already exists", configuration.getMidpointHome()+"/tmp");
         		}
 
         		tmpDir = new File(configuration.getMidpointHome()+"/tmp/initial-objects");
         		if (!tmpDir.mkdir()) {
-        			LOGGER.error("Failed to create temporary directory for inital objects {}", configuration.getMidpointHome()+"/tmp/initial-objects");
-        			throw new RuntimeException("Failed to create temporary directory for inital objects " + configuration.getMidpointHome()+"/tmp/initial-objects");
+        			LOGGER.warn("Failed to create temporary directory for inital objects {}. Maybe it already exists", configuration.getMidpointHome()+"/tmp/initial-objects");
         		}
 
         		//prerequisite: we are expecting that the files are store in the same archive as the source code that is loading it