The project is rearranged to make it build.

VAMDC · Feb 1, 2018 · b7ac33d · b7ac33d
1 parent 6262f32
commit b7ac33d
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+/server/target/
+/common/target/
+/webapp/target/
+/client-lite/target/
+/xmldb/target/
diff --git a/common/src/main/resources/schema/.DS_Store b/common/src/main/resources/schema/.DS_Store
diff --git a/common/src/main/resources/schema/.cvsignore b/common/src/main/resources/schema/.cvsignore
@@ -0,0 +1,2 @@
+.DS_Store
+SchemaAnalysis
diff --git a/common/src/main/resources/schema/cea/.cvsignore b/common/src/main/resources/schema/cea/.cvsignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/common/src/main/resources/schema/cea/CEABase/.cvsignore b/common/src/main/resources/schema/cea/CEABase/.cvsignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/common/src/main/resources/schema/cea/CEABase/v1.0rc1/.cvsignore b/common/src/main/resources/schema/cea/CEABase/v1.0rc1/.cvsignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/common/src/main/resources/schema/vo-resource-types/.DS_Store b/common/src/main/resources/schema/vo-resource-types/.DS_Store
diff --git a/common/src/main/resources/schema/vo-resource-types/.cvsignore b/common/src/main/resources/schema/vo-resource-types/.cvsignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/common/src/main/resources/schema/vo-resource-types/CEAService/.cvsignore b/common/src/main/resources/schema/vo-resource-types/CEAService/.cvsignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/common/src/main/resources/schema/vo-resource-types/VAMDC-TAP/.DS_Store b/common/src/main/resources/schema/vo-resource-types/VAMDC-TAP/.DS_Store
diff --git a/common/src/main/resources/schema/vo-resource-types/VAMDC-TAP/.cvsignore b/common/src/main/resources/schema/vo-resource-types/VAMDC-TAP/.cvsignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/common/src/main/resources/schema/vo-resource-types/VOApplication/.cvsignore b/common/src/main/resources/schema/vo-resource-types/VOApplication/.cvsignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>3.8</version>
+        <version>4.12</version>
       </dependency>
       <dependency>
         <groupId>axis</groupId>

diff --git a/webapp/nb-configuration.xml b/webapp/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>gfv3ee6</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
+    </properties>
+</project-shared-configuration>
diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -79,11 +79,6 @@ There are some irritations
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.astrogrid</groupId>
-      <artifactId>astrogrid-contracts</artifactId>
-    </dependency>
-
 
 	<dependency>
       <groupId>net.sf.saxon</groupId>