Changeset 5946 for ComponentRegistry

Timestamp:

01/21/15 16:33:20 (9 years ago)

Author:

Twan Goosen

Message:

merged some changes from trunk to 2.0 branch

Location:

ComponentRegistry/branches/ComponentRegistry-2.0

Files:

• . (modified) (1 prop)
• CHANGES (modified) (1 diff, 1 prop)
• ComponentRegistry (modified) (1 prop)
• ComponentRegistry/src/main/webapp/WEB-INF/web-shib.xml (modified) (2 diffs)
• ComponentRegistry/src/main/webapp/WEB-INF/web-test.xml (modified) (1 diff)
• UPDATE (modified) (2 diffs)

ComponentRegistry/branches/ComponentRegistry-2.0/CHANGES

@@ -1 +1 @@
 Bug Fixes and Features
+
+Release ComponentRegistry-1.14.5 (?? January 2014)
+- The Component Registry now connects to the CLARIN Concept Registry instead of ISOcat. https://trac.clarin.eu/ticket/731
+- Group components can now be saved as new in the private workspace. https://trac.clarin.eu/ticket/717
+- Reduced noice in log output. https://trac.clarin.eu/ticket/714 ; https://trac.clarin.eu/ticket/715
 
 Release ComponentRegistry-1.14.2 (2 December 2014)

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

@@ -6 +6 @@
 -->
 
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" 
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
     <display-name>ComponentRegistry</display-name>
     <description>Clarin Metadata Component Registry</description>
-
-
-    <context-param>
-        <param-name>ShhaaConfigLocation</param-name>
-        <param-value>/WEB-INF/shhaa.xml</param-value>
-    </context-param>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener
+        </listener-class>
+    </listener>
+    
     <context-param>
         <param-name>contextConfigLocation</param-name>
@@ -21 +21 @@
         </param-value>
     </context-param>
+    
+    <context-param>
+        <param-name>eu.clarin.cmdi.componentregistry.jpaDialect</param-name>
+        <param-value>org.hibernate.dialect.PostgreSQLDialect</param-value>
+    </context-param>
 
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-    
-    
+    <context-param>
+        <param-name>ShhaaConfigLocation</param-name>
+        <param-value>/WEB-INF/shhaa.xml</param-value>
+    </context-param>    
 
     <filter>

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

@@ -17 +17 @@
         <param-value>classpath:spring-config/applicationContext.xml,classpath:spring-config/container-environment.xml
         </param-value>
+    </context-param>
+    
+    <context-param>
+        <param-name>eu.clarin.cmdi.componentregistry.jpaDialect</param-name>
+        <param-value>org.hibernate.dialect.PostgreSQLDialect</param-value>
     </context-param>
 

ComponentRegistry/branches/ComponentRegistry-2.0/UPDATE

@@ -25 +25 @@
 === 1.15.0 ===
 
-- ComponentRegistry no longer provides its own JDBC driver jar. In case the Tomcat 
-  container does NOT provide a suitable PostgreSQL JDBC driver yet:
-
-    - Download a suitable version and deploy it as a provided library in the Tomcat
-
 - Remove the context parameter eu.clarin.cmdi.componentregistry.jpaDialect from the global
   context.xml or application context fragment, as it is now provided within the web.xml 
   of the application itself.
-  
   
 === 1.14.5 ===
@@ -63 +57 @@
           name="eu.clarin.cmdi.componentregistry.jpaDialect" 
           value="org.hibernate.dialect.PostgreSQLDialect"/> 
+          
+- ComponentRegistry no longer provides its own JDBC driver jar. In case the Tomcat 
+  container does NOT provide a suitable PostgreSQL JDBC driver yet:
+
+    - Download a suitable version and deploy it as a provided library in the Tomcat
+
 
 === 1.13 ===