tfr42: Changes made to Maven POM files and Java source code to fix th…

…e issues #535 and #601
deegree · Nov 25, 2013 · 3969e2c · 3969e2c
1 parent e1a2af1
commit 3969e2c
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 100 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,7 @@ target
 .classpath
 .project
 .settings
+.metadata
+.idea
+*.iml
 
diff --git a/...-client/deegree-jsf-console/src/main/java/org/deegree/console/moduleinfo/ModulesBean.java b/...-client/deegree-jsf-console/src/main/java/org/deegree/console/moduleinfo/ModulesBean.java
@@ -40,7 +40,7 @@
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 
-import org.deegree.commons.modules.ModuleInfo;
+import org.deegree.workspace.standard.ModuleInfo;
 import org.deegree.console.workspace.WorkspaceBean;
 
 /**

diff --git a/...client/deegree-jsf-console/src/main/java/org/deegree/console/workspace/WorkspaceBean.java b/...client/deegree-jsf-console/src/main/java/org/deegree/console/workspace/WorkspaceBean.java
@@ -63,7 +63,7 @@
 import org.apache.http.HttpResponse;
 import org.deegree.client.core.model.UploadedFile;
 import org.deegree.commons.config.DeegreeWorkspace;
-import org.deegree.commons.modules.ModuleInfo;
+import org.deegree.workspace.standard.ModuleInfo;
 import org.deegree.commons.utils.Pair;
 import org.deegree.commons.utils.io.Zip;
 import org.deegree.commons.utils.net.HttpUtils;

diff --git a/deegree-core/deegree-core-annotations/pom.xml b/deegree-core/deegree-core-annotations/pom.xml
@@ -28,15 +28,16 @@
     </repository>
   </repositories>
 
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <encoding>UTF-8</encoding>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+          <encoding>${project.build.sourceEncoding}</encoding>
           <proc>none</proc>
         </configuration>
       </plugin>

diff --git a/...-core/deegree-core-commons/src/main/java/org/deegree/commons/config/DeegreeWorkspace.java b/...-core/deegree-core-commons/src/main/java/org/deegree/commons/config/DeegreeWorkspace.java
@@ -60,7 +60,7 @@
 
 import javax.imageio.ImageIO;
 
-import org.deegree.commons.modules.ModuleInfo;
+import org.deegree.workspace.standard.ModuleInfo;
 import org.deegree.workspace.Workspace;
 import org.deegree.workspace.standard.DefaultWorkspace;
 import org.slf4j.Logger;

diff --git a/...-core/deegree-core-workspace/src/main/java/org/deegree/workspace/standard/ModuleInfo.java b/...-core/deegree-core-workspace/src/main/java/org/deegree/workspace/standard/ModuleInfo.java
@@ -190,7 +190,7 @@ public static ModuleInfo extractModuleInfo( URL classpathURL )
                 moduleInfo = new ModuleInfo( buildArtifactId, pomVersion, buildRev, buildDate, buildBy );
             } finally {
                 closeQuietly( buildInfoStream );
-                closeQuietly( classLoader );
+                //* closeQuietly( classLoader ); */ // TODO enable for JDK 1.7  
             }
         }
         return moduleInfo;

diff --git a/...ree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java b/...ree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java
@@ -98,7 +98,7 @@
 import org.deegree.commons.concurrent.Executor;
 import org.deegree.commons.config.DeegreeWorkspace;
 import org.deegree.commons.config.ResourceInitException;
-import org.deegree.commons.modules.ModuleInfo;
+import org.deegree.workspace.standard.ModuleInfo;
 import org.deegree.commons.ows.exception.OWSException;
 import org.deegree.commons.tom.ows.Version;
 import org.deegree.commons.utils.DeegreeAALogoUtils;

diff --git a/deegree-spring/pom.xml b/deegree-spring/pom.xml
@@ -7,6 +7,7 @@
 	</parent>
 	<artifactId>deegree-spring</artifactId>
 	<description>deegree Spring framework integration module</description>
+    <name>deegree-spring</name>
 
 	<build>
 		<plugins>