Changeset 6446 for ComponentRegistry

Timestamp:

08/12/15 07:48:58 (9 years ago)

Author:

Twan Goosen

Message:

brought 2.0 branch up to date with trunk

Location:

ComponentRegistry/branches/ComponentRegistry-2.0

Files:

• . (modified) (1 prop)
• ComponentRegistry (modified) (1 prop)
• ComponentRegistry/src/main/resources/ccr2dcif.xsl (modified) (1 diff)
• ComponentRegistry/src/main/webapp/WEB-INF/web-shib.xml (modified) (1 diff)
• ComponentRegistry/src/main/webapp/WEB-INF/web-test.xml (modified) (1 diff)
• pom.xml (modified) (1 diff, 1 prop)

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/resources/ccr2dcif.xsl

@@ -18 +18 @@
                 </dcif:dataCategorySelection>
         </xsl:template>
-        
-        <xsl:template match="skos:Concept">
+
+        <xsl:template match="rdf:Description[rdf:type/@rdf:resource='http://www.w3.org/2004/02/skos/core#Concept']">    
                 <dcif:dataCategory
                         definition="{(skos:definition[@xml:lang='en'])[1]}"

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/WEB-INF/web-shib.xml

@@ -142 +142 @@
         <load-on-startup>2</load-on-startup>
     </servlet>
+        
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
 
 </web-app>

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/WEB-INF/web-test.xml

@@ -157 +157 @@
         
     <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
     </welcome-file-list>
         

ComponentRegistry/branches/ComponentRegistry-2.0/pom.xml

@@ -12 +12 @@
   <modules>
     <module>ComponentRegistry</module>
+    <module>ComponentSpecFixer</module>
   </modules>