Changeset 6446
- Timestamp:
- 08/12/15 07:48:58 (9 years ago)
- Location:
- ComponentRegistry/branches/ComponentRegistry-2.0
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
ComponentRegistry/branches/ComponentRegistry-2.0
- Property svn:mergeinfo changed
/ComponentRegistry/trunk merged: 6444-6445
- Property svn:mergeinfo changed
-
ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry
- Property svn:mergeinfo changed
/ComponentRegistry/trunk/ComponentRegistry merged: 6445
- Property svn:mergeinfo changed
-
ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/resources/ccr2dcif.xsl
r6060 r6446 18 18 </dcif:dataCategorySelection> 19 19 </xsl:template> 20 21 <xsl:template match=" skos:Concept">20 21 <xsl:template match="rdf:Description[rdf:type/@rdf:resource='http://www.w3.org/2004/02/skos/core#Concept']"> 22 22 <dcif:dataCategory 23 23 definition="{(skos:definition[@xml:lang='en'])[1]}" -
ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/WEB-INF/web-shib.xml
r6286 r6446 142 142 <load-on-startup>2</load-on-startup> 143 143 </servlet> 144 145 <welcome-file-list> 146 <welcome-file>index.html</welcome-file> 147 </welcome-file-list> 144 148 145 149 </web-app> -
ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/WEB-INF/web-test.xml
r6286 r6446 157 157 158 158 <welcome-file-list> 159 <welcome-file>index. jsp</welcome-file>159 <welcome-file>index.html</welcome-file> 160 160 </welcome-file-list> 161 161 -
ComponentRegistry/branches/ComponentRegistry-2.0/pom.xml
- Property svn:mergeinfo changed
/ComponentRegistry/trunk/pom.xml (added) merged: 6444
r5936 r6446 12 12 <modules> 13 13 <module>ComponentRegistry</module> 14 <module>ComponentSpecFixer</module> 14 15 </modules> 15 16 - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.