Changeset 6871 for ComponentRegistry/branches/ComponentRegistry-2.0

Timestamp:

12/17/15 10:55:41 (9 years ago)

Author:

Twan Goosen

Message:

merged various changes into 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/META-INF/context.xml (modified) (1 diff)
• ComponentRegistry/src/main/webapp/index.jsp (modified) (1 diff)
• pom.xml (modified) (2 diffs, 1 prop)

ComponentRegistry/branches/ComponentRegistry-2.0/CHANGES

@@ -1 +1 @@
 Bug Fixes and Features
 
-Release ComponentRegistry-1.14.5 (2 February 2014)
+Release ComponentRegistry-1.14.6 (12 August 2015)
+- Modification in the processing of CCR responses to account for a planned change in the response format
+
+Release ComponentRegistry-1.14.5 (2 February 2015)
 - 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

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/META-INF/context.xml

@@ -50 +50 @@
         Space-separated list of users (getRemoteUser()) that should have access to the admin area of the ComponentRegistry
     -->
-  <Parameter name="eu.clarin.cmdi.componentregistry.adminUsers" value="twagoo@mpi.nl olhsha@mpi.nl daan.broeder@mpi.nl dietuyt@mpi.nl Menzo.Windhouwer@mpi.nl"/>
+  <Parameter name="eu.clarin.cmdi.componentregistry.adminUsers" value="twagoo@mpi.nl olhsha@mpi.nl daan.broeder@mpi.nl dietuyt@mpi.nl menwin@mpi.nl"/>
   <!--
         Location of the CMDI general component schema that validates component specifications

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/index.jsp

@@ -23 +23 @@
             <input type="submit" value="Log in"/>
         </form>
-            
-        <!-- Piwik -->
-        <script type="text/javascript">
-          var _paq = _paq || [];
-          _paq.push(['trackPageView']);
-          _paq.push(['enableLinkTracking']);
-          (function() {
-            var u="//stats.clarin.eu/";
-            _paq.push(['setTrackerUrl', u+'piwik.php']);
-            _paq.push(['setSiteId', 17]);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-          })();
-        </script>
-        <noscript><p><img src="//stats.clarin.eu/piwik.php?idsite=17" style="border:0;" alt="" /></p></noscript>
-        <!-- End Piwik Code -->
-            
-    </body>
+
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//stats.clarin.eu/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', 17]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="//stats.clarin.eu/piwik.php?idsite=17" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
+
+</body>
 </html>

ComponentRegistry/branches/ComponentRegistry-2.0/pom.xml

@@ -12 +12 @@
   <modules>
     <module>ComponentRegistry</module>
-    <module>ComponentSpecFixer</module>
   </modules>
 
@@ -26 +25 @@
   <repositories>
         <repository>
-                <id>cmdi.clarin.repository</id>
+        <id>CLARIN</id>
                 <name>Clarin Repository</name>
-                <url>http://catalog.clarin.eu/ds/nexus/content/groups/public/</url> 
+        <url>https://nexus.clarin.eu/content/repositories/Clarin</url>
         </repository> 
-        
  </repositories>