[exo-jcr-commits] exo-jcr SVN: r5565 - in jcr/trunk/applications/product-patches/as: jetty and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Feb 2 08:35:00 EST 2012


Author: nzamosenchuk
Date: 2012-02-02 08:34:59 -0500 (Thu, 02 Feb 2012)
New Revision: 5565

Modified:
   jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml
   jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml
   jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml
   jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml
   jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt
Log:
EXOJCR-1742 : fix configurations for all AppServers.

Modified: jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml	2012-02-02 11:52:55 UTC (rev 5564)
+++ jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml	2012-02-02 13:34:59 UTC (rev 5565)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
    xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
 
@@ -209,7 +209,7 @@
     </init-params>   
   </component>
 
-  <component profiles="ispn,jbc">
+  <component profiles="jbc">
     <key>org.exoplatform.services.rpc.RPCService</key>
     <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
     <init-params>
@@ -227,6 +227,26 @@
       </value-param>
     </init-params>
   </component>  
+
+  <component profiles="ispn">
+    <key>org.exoplatform.services.rpc.RPCService</key>
+    <type>org.exoplatform.services.rpc.jgv3.RPCServiceImpl</type>
+    <init-params>
+      <value-param>
+        <name>jgroups-configuration</name>
+        <value>jar:/conf/udp-mux-v3.xml</value>
+      </value-param>
+      <value-param>
+        <name>jgroups-cluster-name</name>
+        <value>RPCService-Cluster</value>
+      </value-param>
+      <value-param>
+        <name>jgroups-default-timeout</name>
+        <value>0</value>
+      </value-param>
+    </init-params>
+  </component>  
+
    <component>
       <type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
       <init-params>
@@ -358,9 +378,9 @@
      <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type>
    </component>
 
-   <component>
-      <key>org.exoplatform.services.security.Authenticator</key>
-      <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+   <component>
+      <key>org.exoplatform.services.security.Authenticator</key>
+      <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
    </component>
 
    <component> 

Modified: jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml	2012-02-02 11:52:55 UTC (rev 5564)
+++ jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml	2012-02-02 13:34:59 UTC (rev 5565)
@@ -209,7 +209,7 @@
     </init-params>   
   </component>
   
-  <component profiles="ispn,jbc">
+  <component profiles="jbc">
     <key>org.exoplatform.services.rpc.RPCService</key>
     <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
     <init-params>
@@ -227,6 +227,26 @@
       </value-param>
     </init-params>
   </component>  
+
+  <component profiles="ispn">
+    <key>org.exoplatform.services.rpc.RPCService</key>
+    <type>org.exoplatform.services.rpc.jgv3.RPCServiceImpl</type>
+    <init-params>
+      <value-param>
+        <name>jgroups-configuration</name>
+        <value>jar:/conf/udp-mux-v3.xml</value>
+      </value-param>
+      <value-param>
+        <name>jgroups-cluster-name</name>
+        <value>RPCService-Cluster</value>
+      </value-param>
+      <value-param>
+        <name>jgroups-default-timeout</name>
+        <value>0</value>
+      </value-param>
+    </init-params>
+  </component>  
+
    <component>
       <type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
       <init-params>

Modified: jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml	2012-02-02 11:52:55 UTC (rev 5564)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml	2012-02-02 13:34:59 UTC (rev 5565)
@@ -209,7 +209,7 @@
     </init-params>   
   </component>
   
-  <component profiles="ispn,jbc">
+  <component profiles="jbc">
     <key>org.exoplatform.services.rpc.RPCService</key>
     <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
     <init-params>
@@ -227,6 +227,26 @@
       </value-param>
     </init-params>
   </component>  
+
+  <component profiles="ispn">
+    <key>org.exoplatform.services.rpc.RPCService</key>
+    <type>org.exoplatform.services.rpc.jgv3.RPCServiceImpl</type>
+    <init-params>
+      <value-param>
+        <name>jgroups-configuration</name>
+        <value>jar:/conf/udp-mux-v3.xml</value>
+      </value-param>
+      <value-param>
+        <name>jgroups-cluster-name</name>
+        <value>RPCService-Cluster</value>
+      </value-param>
+      <value-param>
+        <name>jgroups-default-timeout</name>
+        <value>0</value>
+      </value-param>
+    </init-params>
+  </component>  
+
    <component>
       <type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
       <init-params>

Modified: jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml	2012-02-02 11:52:55 UTC (rev 5564)
+++ jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml	2012-02-02 13:34:59 UTC (rev 5565)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
    xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
 
@@ -225,7 +225,7 @@
     </init-params>   
   </component>
   
-  <component profiles="ispn,jbc">
+  <component profiles="jbc">
     <key>org.exoplatform.services.rpc.RPCService</key>
     <type>org.exoplatform.services.rpc.impl.RPCServiceImpl</type>
     <init-params>
@@ -243,6 +243,26 @@
       </value-param>
     </init-params>
   </component>  
+
+  <component profiles="ispn">
+    <key>org.exoplatform.services.rpc.RPCService</key>
+    <type>org.exoplatform.services.rpc.jgv3.RPCServiceImpl</type>
+    <init-params>
+      <value-param>
+        <name>jgroups-configuration</name>
+        <value>jar:/conf/udp-mux-v3.xml</value>
+      </value-param>
+      <value-param>
+        <name>jgroups-cluster-name</name>
+        <value>RPCService-Cluster</value>
+      </value-param>
+      <value-param>
+        <name>jgroups-default-timeout</name>
+        <value>0</value>
+      </value-param>
+    </init-params>
+  </component>  
+
    <component>
       <type>org.exoplatform.services.rest.impl.method.MethodInvokerFilterComponentPlugin</type>
       <init-params>
@@ -374,9 +394,9 @@
      <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type>
    </component>
 
-   <component>
-      <key>org.exoplatform.services.security.Authenticator</key>
-      <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+   <component>
+      <key>org.exoplatform.services.security.Authenticator</key>
+      <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
    </component>
 
    <component> 

Modified: jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt	2012-02-02 11:52:55 UTC (rev 5564)
+++ jcr/trunk/applications/product-patches/as/tomcat/exo-readme.txt	2012-02-02 13:34:59 UTC (rev 5565)
@@ -13,3 +13,8 @@
 * "eXo.bat run" to launch eXo JCR with the default configuration
 * "eXo.bat ispn run" to launch eXo JCR with the configuration for Infinispan
 * "eXo.bat jbc run" to launch eXo JCR with the configuration for JBoss Cache
+
+Notice!
+JCR Bundles for Infinispan and JBoss Cache differs by their dependencies. 
+In ordrer to run eXo JCR with Infinispan configuration it must be deployed 
+with "ispn" profile.



More information about the exo-jcr-commits mailing list