Changeset 5308

Timestamp:

05/28/14 14:45:44 (10 years ago)

Author:

Twan Goosen

Message:

merged resources/META-INF into webapp/META-INF

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry

Files:

• Protocol.txt (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionMarshaller.java (modified) (1 diff)
• src/main/resources/META-INF (deleted)
• src/main/resources/VirtualCollection.xsd (copied) (copied from VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/resources/META-INF/VirtualCollection.xsd)
• src/main/webapp/META-INF/persistence.xml (copied) (copied from VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/resources/META-INF/persistence.xml)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/Protocol.txt

@@ -11 +11 @@
        A virtual collection is represented in an internal XML format, which is
        defined by the W3C XML schema "VirtualCollection.xsd" found in the
-       "src/resources/META-INF" directory.
+       "src/main/resources" directory.
        
     b) The VCR relies on various HTTP headers:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/pom.xml

@@ -112 +112 @@
           <target>${maven.compiler.target}</target>
           <compilerArgument>-proc:none</compilerArgument>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.1.1</version>
-        <configuration>
-          <webResources>
-            <!-- additional web resources: also copy schemas to web-app -->
-            <resource>
-              <directory>src/main/resources/META-INF</directory>
-              <targetPath>schema</targetPath>
-              <includes>
-                <include>*.xsd</include>
-              </includes>
-            </resource>
-          </webResources>
         </configuration>
       </plugin>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionMarshaller.java

@@ -64 +64 @@
             URL url = VirtualCollectionMarshaller.class
                     .getClassLoader()
-                    .getResource("META-INF/VirtualCollection.xsd");
+                    .getResource("VirtualCollection.xsd");
             if (url == null) {
                 throw new NullPointerException("schema not found!");