[exo-jcr-commits] exo-jcr SVN: r459 - in ws/branches/2.2.x: exo.ws.rest.core/src/main/java/conf and 10 other directories.

[do-not-reply at jboss.org]

Author: aparfonov
Date: 2009-10-30 17:47:17 -0400 (Fri, 30 Oct 2009)
New Revision: 459

Added:
   ws/branches/2.2.x/exo.ws.commons/
   ws/branches/2.2.x/exo.ws.frameworks.javascript.cross-domain-ajax/
   ws/branches/2.2.x/exo.ws.frameworks.json/
   ws/branches/2.2.x/exo.ws.frameworks.servlet/
   ws/branches/2.2.x/exo.ws.rest.core/
   ws/branches/2.2.x/exo.ws.rest.core/src/main/resources/conf/
   ws/branches/2.2.x/exo.ws.rest.core/src/main/resources/conf/portal/
   ws/branches/2.2.x/exo.ws.rest.core/src/test/resources/conf/
   ws/branches/2.2.x/exo.ws.rest.deploy/
   ws/branches/2.2.x/exo.ws.rest.ext/
   ws/branches/2.2.x/exo.ws.testframework/
Removed:
   ws/branches/2.2.x/commons/
   ws/branches/2.2.x/exo.ws.rest.core/src/main/java/conf/portal/
   ws/branches/2.2.x/exo.ws.rest.core/src/test/java/conf/
   ws/branches/2.2.x/exo.ws.rest.ext/src/main/java/conf/
   ws/branches/2.2.x/exo.ws.rest.ext/src/test/java/conf/
   ws/branches/2.2.x/frameworks/javascript/cross-domain-ajax/
   ws/branches/2.2.x/frameworks/json/
   ws/branches/2.2.x/frameworks/servlet/
   ws/branches/2.2.x/rest/core/
   ws/branches/2.2.x/rest/exo.ws.rest.deploy/
   ws/branches/2.2.x/rest/ext/
   ws/branches/2.2.x/testframework/
Modified:
   ws/branches/2.2.x/exo.ws.rest.deploy/src/main/resources/conf/portal/configuration.xml
   ws/branches/2.2.x/pom.xml
Log:
Apply module name rules to branches

Copied: ws/branches/2.2.x/exo.ws.commons (from rev 444, ws/branches/2.2.x/commons)

Copied: ws/branches/2.2.x/exo.ws.frameworks.javascript.cross-domain-ajax (from rev 444, ws/branches/2.2.x/frameworks/javascript/cross-domain-ajax)

Copied: ws/branches/2.2.x/exo.ws.frameworks.json (from rev 444, ws/branches/2.2.x/frameworks/json)

Copied: ws/branches/2.2.x/exo.ws.frameworks.servlet (from rev 444, ws/branches/2.2.x/frameworks/servlet)

Copied: ws/branches/2.2.x/exo.ws.rest.core (from rev 458, ws/branches/2.2.x/rest/core)

Copied: ws/branches/2.2.x/exo.ws.rest.core/src/main/resources/conf/portal (from rev 458, ws/branches/2.2.x/rest/core/src/main/java/conf/portal)

Copied: ws/branches/2.2.x/exo.ws.rest.core/src/test/resources/conf (from rev 458, ws/branches/2.2.x/rest/core/src/test/java/conf)

Copied: ws/branches/2.2.x/exo.ws.rest.deploy (from rev 444, ws/branches/2.2.x/rest/exo.ws.rest.deploy)

Modified: ws/branches/2.2.x/exo.ws.rest.deploy/src/main/resources/conf/portal/configuration.xml
===================================================================
--- ws/branches/2.2.x/rest/exo.ws.rest.deploy/src/main/resources/conf/portal/configuration.xml	2009-10-29 16:49:03 UTC (rev 444)
+++ ws/branches/2.2.x/exo.ws.rest.deploy/src/main/resources/conf/portal/configuration.xml	2009-10-30 21:47:17 UTC (rev 459)
@@ -22,35 +22,8 @@
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
    xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
+   
    <component>
-      <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
-      <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
-      <init-params>
-         <value-param>
-            <name>logger</name>
-            <value>org.slf4j.Logger</value>
-         </value-param>
-         <value-param>
-            <name>configurator</name>
-            <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
-         </value-param>
-         <properties-param>
-            <name>properties</name>
-            <description>Log4J properties</description>
-            <property name="log4j.rootLogger" value="INFO, stdout" />
-            <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender" />
-            <property name="log4j.appender.stdout.threshold" value="DEBUG" />
-            <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" />
-            <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" />
-            <property name="log4j.appender.file" value="org.apache.log4j.FileAppender" />
-            <property name="log4j.appender.file.File" value="target/container.log" />
-            <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout" />
-            <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" />
-         </properties-param>
-      </init-params>
-   </component>
-   <component>
       <type>org.exoplatform.services.rest.impl.ExoJAXRSApplication</type>
       <init-params>
          <values-param>

Copied: ws/branches/2.2.x/exo.ws.rest.ext (from rev 444, ws/branches/2.2.x/rest/ext)

Copied: ws/branches/2.2.x/exo.ws.testframework (from rev 444, ws/branches/2.2.x/testframework)

Modified: ws/branches/2.2.x/pom.xml
===================================================================
--- ws/branches/2.2.x/pom.xml	2009-10-30 16:21:38 UTC (rev 458)
+++ ws/branches/2.2.x/pom.xml	2009-10-30 21:47:17 UTC (rev 459)
@@ -36,9 +36,9 @@
    <name>eXo WS</name>
 
    <scm>
-      <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/ws/trunk</connection>
-      <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/ws/trunk</developerConnection>
-      <url>http://fisheye.jboss.org/browse/exo-jcr/ws/trunk</url>
+      <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/ws/branches/2.2.x</connection>
+      <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/ws/branches/2.2.x</developerConnection>
+      <url>http://fisheye.jboss.org/browse/exo-jcr/ws/branches/2.2.x</url>
    </scm>
 
    <properties>