Changeset 5312

Timestamp:

05/30/14 13:33:52 (10 years ago)

Author:

Twan Goosen

Message:

Reverted changes in META-INF (will revisit)
Fixed login upon accessing restricted pages. Login button not working yet

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/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.java (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/ApplicationSession.java (modified) (1 diff)
• src/main/resources/VirtualCollection.xsd (deleted)
• src/main/webapp/META-INF/persistence.xml (deleted)
• src/main/webapp/WEB-INF/web.xml (modified) (1 diff)

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/main/resources" directory.
+       "src/resources/META-INF" 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("VirtualCollection.xsd");
+                    .getResource("META-INF/VirtualCollection.xsd");
             if (url == null) {
                 throw new NullPointerException("schema not found!");

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.java

@@ -51 +51 @@
             getMarkupSettings().setStripComments(true);
         }
+        mountBookmarkablePage("/login",
+                LoginPage.class);
         mountBookmarkablePage("/public",
                 BrowsePublicCollectionsPage.class);

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/ApplicationSession.java

@@ -44 +44 @@
     @Override
     public boolean authenticate(String username, String password) {
-        if (username != null) {
-            replaceSession();
-            return true;
-        }
-        return false;
+        return username != null;
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/WEB-INF/web.xml

@@ -116 +116 @@
             <web-resource-name>VirtualCollectionRegistryApplication</web-resource-name>
             <description></description>
-            <url-pattern>/app/*</url-pattern>
+            <url-pattern>/app/login</url-pattern>
             <http-method>GET</http-method>
         </web-resource-collection>