March 2011 - gatein-commits - Jboss List Archives

gatein SVN: r6042 - in components/wsrp/trunk: admin-gui and 9 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-16 16:18:52 -0400 (Wed, 16 Mar 2011) New Revision: 6042 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/jcr-impl/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/test/pom.xml components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/handler/MockSOAPBody.java components/wsrp/trunk/ws-security/jboss5/pom.xml components/wsrp/trunk/ws-security/wss/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml Log: - GTNWSRP-210: Removed dependency on JBoss common. Added explicit dependencies that were previously gotten from GateIn common. Use provided scope whenever possible. Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/admin-gui/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -82,11 +83,28 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/common/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -44,6 +45,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> @@ -56,16 +58,24 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId> + <scope>provided</scope> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.google.collections</groupId> <artifactId>google-collections</artifactId> </dependency> @@ -73,10 +83,15 @@  <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> + <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>test-framework</artifactId> <version>${project.version}</version> Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/consumer/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -53,6 +54,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> @@ -71,12 +73,14 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> + <scope>provided</scope> </dependency>  <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-fileupload</groupId> @@ -99,9 +103,16 @@ </dependency> <dependency> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + + +  + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> <scope>test</scope> </dependency> <dependency> @@ -110,6 +121,11 @@ <version>1.8.5</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies>  Modified: components/wsrp/trunk/jcr-impl/pom.xml =================================================================== --- components/wsrp/trunk/jcr-impl/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/jcr-impl/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -37,17 +37,14 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-integration-api</artifactId> - <version>${project.version}</version> </dependency> <dependency> @@ -63,7 +60,20 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> \ No newline at end of file Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -48,7 +48,7 @@ <properties> <version.gatein.pc>2.3.0-Beta01</version.gatein.pc> - <version.gatein.common>2.0.4-Beta01</version.gatein.common> + <version.gatein.common>2.0.4-Beta02-SNAPSHOT</version.gatein.common> <version.gatein.wci>2.1.0-Beta01</version.gatein.wci> <version.jsf>1.2_12</version.jsf> Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/producer/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -49,6 +50,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> @@ -66,6 +68,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-fileupload</groupId> @@ -78,6 +81,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> + <scope>provided</scope> </dependency>  @@ -89,7 +93,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> + <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> <dependency> @@ -98,6 +102,11 @@ <version>1.8.5</version> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: components/wsrp/trunk/test/pom.xml =================================================================== --- components/wsrp/trunk/test/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/test/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -22,7 +22,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -42,19 +43,33 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp1-ws</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId> + <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>provided</scope> + </dependency> </dependencies> Modified: components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/handler/MockSOAPBody.java =================================================================== --- components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/handler/MockSOAPBody.java 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/handler/MockSOAPBody.java 2011-03-16 20:18:52 UTC (rev 6042) @@ -22,10 +22,15 @@ package org.gatein.wsrp.test.handler; -import org.jboss.util.xml.DOMUtils; +import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.xml.sax.SAXException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.soap.SOAPBody; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -38,7 +43,23 @@ public class MockSOAPBody implements InvocationHandler { Element body; + private static DocumentBuilder BUILDER; + static + { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setValidating(false); + factory.setNamespaceAware(true); + try + { + BUILDER = factory.newDocumentBuilder(); + } + catch (ParserConfigurationException e) + { + BUILDER = null; + } + } + public MockSOAPBody(Element body) { this.body = body; @@ -47,11 +68,24 @@ public static SOAPBody newInstance(String body) throws IOException { return (SOAPBody)Proxy.newProxyInstance(MockSOAPBody.class.getClassLoader(), new Class[]{SOAPBody.class}, - new MockSOAPBody(DOMUtils.parse(body))); + new MockSOAPBody(parse(body))); } public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { return method.invoke(body, args); } + + private static Element parse(String elementAsString) throws IOException + { + try + { + Document doc = BUILDER.parse(new ByteArrayInputStream(elementAsString.getBytes("UTF-8"))); + return doc.getDocumentElement(); + } + catch (SAXException e) + { + throw new IOException(e.toString()); + } + } } Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -50,6 +50,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> Modified: components/wsrp/trunk/ws-security/wss/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -50,6 +50,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -261,6 +261,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId>

13 years, 3 months

1
0
0 / 0

gatein SVN: r6040 - in components/common/trunk: logging and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-16 10:05:57 -0400 (Wed, 16 Mar 2011) New Revision: 6040 Modified: components/common/trunk/common/pom.xml components/common/trunk/logging/pom.xml components/common/trunk/mc/pom.xml Log: - GTNCOMMON-15: + Removed unused javax.activation and commons-httpclient dependencies, made jboss-vfs and servlet-api provided. Ideally, VFSZipURLNavigationProvider and other JBoss-specific classes should be moved to a JBoss-specific module. + Made slf4j-api provided Modified: components/common/trunk/common/pom.xml =================================================================== --- components/common/trunk/common/pom.xml 2011-03-16 04:47:19 UTC (rev 6039) +++ components/common/trunk/common/pom.xml 2011-03-16 14:05:57 UTC (rev 6040) @@ -23,24 +23,21 @@ <scope>test</scope> </dependency> +  <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <scope>provided</scope> </dependency> <dependency> Modified: components/common/trunk/logging/pom.xml =================================================================== --- components/common/trunk/logging/pom.xml 2011-03-16 04:47:19 UTC (rev 6039) +++ components/common/trunk/logging/pom.xml 2011-03-16 14:05:57 UTC (rev 6040) @@ -33,6 +33,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> Modified: components/common/trunk/mc/pom.xml =================================================================== --- components/common/trunk/mc/pom.xml 2011-03-16 04:47:19 UTC (rev 6039) +++ components/common/trunk/mc/pom.xml 2011-03-16 14:05:57 UTC (rev 6040) @@ -36,6 +36,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <scope>provided</scope> </dependency> </dependencies>

13 years, 3 months

1
0
0 / 0

gatein SVN: r6039 - in portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp: skin/applicationregistry/webui/component/UIApplicationRegistryPortlet and 1 other directory.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2011-03-16 00:47:19 -0400 (Wed, 16 Mar 2011) New Revision: 6039 Modified: portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css Log: GTNPORTAL-1733 Error UI when add new remote gadget Modified: portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2011-03-15 18:18:22 UTC (rev 6038) +++ portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIGadgetInfo.gtmpl 2011-03-16 04:47:19 UTC (rev 6039) @@ -24,7 +24,7 @@ <div class="Refresh16x16Icon ControlIcon" title="<%=_ctx.appRes("UIGadgetInfo.title.refresh")%>" onclick="<%= uicomponent.event("Refresh") %>"><span></span></div> <div class="ClearBoth"><span></span></div> </div> - <div class="Application"> + <div class="Application ClearFix"> <div class="PortletIcons"> <img src="$gadgetThumbnail" onError="src='$srcBGError'" alt=""/> </div> Modified: portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-03-15 18:18:22 UTC (rev 6038) +++ portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-03-16 04:47:19 UTC (rev 6039) @@ -484,9 +484,15 @@ /******************************** UIGadgetManagement ******************************/ .UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons { width: 150px; - padding-top: 20px; text-align: center; + padding: 10px 0px; + text-align: center; + height: auto; } +.UIApplicationRegistryPortlet .UIGadgetManagement .PortletIcons img { + width: 150px; +} + .UIApplicationRegistryPortlet .UIGadgetManagement .ApplicationContent { margin-left: 150px; /* orientation=lt */ margin-right: 150px; /* orientation=rt */

13 years, 3 months

1
0
0 / 0

gatein SVN: r6038 - components/wsrp/trunk.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-03-15 14:18:22 -0400 (Tue, 15 Mar 2011) New Revision: 6038 Modified: components/wsrp/trunk/pom.xml Log: GTNWSRP-206: Update Maven dependencies Removed repository definitions Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-03-15 17:24:25 UTC (rev 6037) +++ components/wsrp/trunk/pom.xml 2011-03-15 18:18:22 UTC (rev 6038) @@ -212,28 +212,4 @@ <module>ws-security</module> </modules> - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/2/</url> - </pluginRepository> - </pluginRepositories> - </project>

13 years, 3 months

1
0
0 / 0

gatein SVN: r6037 - in components/wsrp/trunk: wsrp-producer-war and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-15 13:24:25 -0400 (Tue, 15 Mar 2011) New Revision: 6037 Modified: components/wsrp/trunk/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml Log: - GTNWSRP-206: Updated to WCI 2.1.0-Beta01, fixed incorrect assembly for test-producer that was making the tests fail. - GTNWSRP-207: Removed duplicated dependency in wsrp-producer-war POM. Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) +++ components/wsrp/trunk/pom.xml 2011-03-15 17:24:25 UTC (rev 6037) @@ -49,8 +49,7 @@ <properties> <version.gatein.pc>2.3.0-Beta01</version.gatein.pc> <version.gatein.common>2.0.4-Beta01</version.gatein.common> -  - <version.gatein.wci>2.0.2-GA</version.gatein.wci> + <version.gatein.wci>2.1.0-Beta01</version.gatein.wci> <version.jsf>1.2_12</version.jsf> <version.servlet>2.5</version.servlet> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-15 17:24:25 UTC (rev 6037) @@ -298,12 +298,6 @@ <dependency> <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.gatein.wsrp</groupId> <artifactId>test-framework</artifactId> <scope>test</scope> <version>${project.version}</version> @@ -316,17 +310,11 @@   -  - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> - <scope>test</scope> - <version>${version.gatein.wci}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-03-15 17:01:56 UTC (rev 6036) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-03-15 17:24:25 UTC (rev 6037) @@ -1,72 +1,72 @@ <assembly> - <id>producer</id> - <formats> - <format>sar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> + <id>producer</id> + <formats> + <format>sar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> -  - <fileSet> - <directory>target/test-classes</directory> - <outputDirectory></outputDirectory> - <includes> - <include>org/gatein/wsrp/config/**</include> - </includes> - </fileSet> -  - <fileSet> - <directory>src/test/producer-sar</directory> - <outputDirectory></outputDirectory> - </fileSet> - </fileSets> + <fileSets> +  + <fileSet> + <directory>target/test-classes</directory> + <outputDirectory></outputDirectory> + <includes> + <include>org/gatein/wsrp/config/**</include> + </includes> + </fileSet> +  + <fileSet> + <directory>src/test/producer-sar</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> - <moduleSets> - <moduleSet> - - <binaries/> - </moduleSet> - </moduleSets> + <moduleSets> + <moduleSet> +  + <binaries/> + </moduleSet> + </moduleSets> - <dependencySets> - <dependencySet> - <scope>test</scope> - <outputDirectory></outputDirectory> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>org.gatein.wsrp:test-framework</include> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory></outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.gatein.wsrp:test-framework</include> - <include>org.gatein.wci:wci-tomcat</include> - <include>org.gatein.wci:wci-wci</include> + <include>org.gatein.wci:wci-tomcat6</include> + <include>org.gatein.wci:wci-wci</include> - <include>org.gatein.pc:pc-portlet</include> - <include>org.gatein.pc:pc-api</include> - <include>javax.portlet:portlet-api</include> + <include>org.gatein.pc:pc-portlet</include> + <include>org.gatein.pc:pc-api</include> + <include>javax.portlet:portlet-api</include> - <include>org.gatein.pc:pc-controller</include> - <include>org.gatein.pc:pc-mc</include> + <include>org.gatein.pc:pc-controller</include> + <include>org.gatein.pc:pc-mc</include> - <include>org.gatein.common:common-common</include> - <include>org.gatein.common:common-logging</include> + <include>org.gatein.common:common-common</include> + <include>org.gatein.common:common-logging</include> - <include>javax.ccpp:ccpp</include> + <include>javax.ccpp:ccpp</include> - <include>org.gatein.wsrp:wsrp-common</include> - <include>org.gatein.wsrp:wsrp-integration-api</include> - <include>org.gatein.wsrp:wsrp-producer-lib</include> - <include>org.gatein.wsrp:wsrp-wsrp1-ws</include> - <include>org.gatein.wsrp:wsrp-wsrp2-ws</include> + <include>org.gatein.wsrp:wsrp-common</include> + <include>org.gatein.wsrp:wsrp-integration-api</include> + <include>org.gatein.wsrp:wsrp-producer-lib</include> + <include>org.gatein.wsrp:wsrp-wsrp1-ws</include> + <include>org.gatein.wsrp:wsrp-wsrp2-ws</include> - <include>junit:junit</include> - <include>commons-fileupload:commons-fileupload</include> + <include>junit:junit</include> + <include>commons-fileupload:commons-fileupload</include> - <include>com.google.collections:google-collections</include> + <include>com.google.collections:google-collections</include> - </includes> - </dependencySet> - </dependencySets> + </includes> + </dependencySet> + </dependencySets> </assembly>

13 years, 3 months

1
0
0 / 0

gatein SVN: r6036 - in components/wsrp/trunk: ws-security and 3 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-15 13:01:56 -0400 (Tue, 15 Mar 2011) New Revision: 6036 Added: components/wsrp/trunk/ws-security/pom.xml Modified: components/wsrp/trunk/pom.xml components/wsrp/trunk/ws-security/jboss5/pom.xml components/wsrp/trunk/ws-security/wss/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml Log: - GTNWSRP-207: Introduced intermediary POM for wss-security module so that Maven 3 will work properly. - GTNWSRP-206: Temporarily reverted to WCI 2.0.2-GA to have a stable build. Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) +++ components/wsrp/trunk/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) @@ -49,7 +49,8 @@ <properties> <version.gatein.pc>2.3.0-Beta01</version.gatein.pc> <version.gatein.common>2.0.4-Beta01</version.gatein.common> - <version.gatein.wci>2.1.0-Beta01</version.gatein.wci> +  + <version.gatein.wci>2.0.2-GA</version.gatein.wci> <version.jsf>1.2_12</version.jsf> <version.servlet>2.5</version.servlet> @@ -209,8 +210,7 @@ <module>wsrp-producer-war</module> <module>hibernate-impl</module> <module>jcr-impl</module> - <module>ws-security/jboss5</module> - <module>ws-security/wss</module> + <module>ws-security</module> </modules> <repositories> Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) +++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) @@ -21,10 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-parent</artifactId> + <artifactId>wsrp-wss-parent</artifactId> <version>2.1.0-Alpha02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -63,7 +64,7 @@ <artifactId>pc-federation</artifactId> </dependency> - + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>GateIn WSRP WS Security Integration</name> + + <parent> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-parent</artifactId> + <version>2.1.0-Alpha02-SNAPSHOT</version> + </parent> + + <artifactId>wsrp-wss-parent</artifactId> + <packaging>pom</packaging> + + <description>GateIn WSRP Integration extension parent</description> + <modules> + <module>wss</module> + <module>jboss5</module> + </modules> +</project> \ No newline at end of file Modified: components/wsrp/trunk/ws-security/wss/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) +++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) @@ -21,10 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-parent</artifactId> + <artifactId>wsrp-wss-parent</artifactId> <version>2.1.0-Alpha02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -63,7 +64,7 @@ <artifactId>pc-federation</artifactId> </dependency> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -315,6 +316,12 @@   +  <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId>

13 years, 3 months

1
0
0 / 0

gatein SVN: r6035 - in components/wsrp/trunk: consumer/src/main/java/org/gatein/wsrp/consumer/handlers and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-15 11:07:48 -0400 (Tue, 15 Mar 2011) New Revision: 6035 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java components/wsrp/trunk/jcr-impl/pom.xml components/wsrp/trunk/pom.xml Log: - GTNWSRP-206: Updated to Chromattic 1.0.6. - Fixed MimeResponseHandler.MarkupProcessor for API change in common 2.0.4-Beta01. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java 2011-03-15 14:39:34 UTC (rev 6034) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java 2011-03-15 15:07:48 UTC (rev 6035) @@ -260,7 +260,7 @@ supportedCustomWindowStates = info.getSupportedCustomWindowStates(); } - public String getReplacementFor(String match, String prefix, String suffix) + public String getReplacementFor(String match, String prefix, String suffix, boolean matchedPrefixOnly) { // We run into some issues with url encoding. We should not be making assumptions about // what url encoding we should be using. For example, we may be dealing with html encoding (ampersand as &) @@ -269,8 +269,8 @@ // we need to assume that is the correct encoding for the situation. // NOTE: there may be other encoding situations we are not currently dealing with :( - - boolean useJavaScriptEscaping = false; + + boolean useJavaScriptEscaping = false; // work around for GTNWSRP-93: if (match.contains("\\x2D") || match.contains("\\x26")) { @@ -279,7 +279,7 @@ } WSRPPortletURL portletURL = WSRPPortletURL.create(match, supportedCustomModes, supportedCustomWindowStates, true); - + URLFormat urlFormat; // If the current url is using & then specify we want to use xml escaped ampersands if (match.contains("&")) @@ -290,16 +290,16 @@ { urlFormat = new URLFormat(format.getWantSecure(), format.getWantAuthenticated(), format.getWantRelative(), false); } - + String value = context.renderURL(portletURL, urlFormat); - + // we now need to add back the javascript url encoding if it was originally used // NOTE: we should fix this by specifying the escaping to be used in URLFormat when it supported (see GTNPC-41) if (useJavaScriptEscaping) { value = value.replaceAll("-", "\\\\x2D").replaceAll("&", "\\\\x26"); } - + return value; } } Modified: components/wsrp/trunk/jcr-impl/pom.xml =================================================================== --- components/wsrp/trunk/jcr-impl/pom.xml 2011-03-15 14:39:34 UTC (rev 6034) +++ components/wsrp/trunk/jcr-impl/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) @@ -22,7 +22,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> @@ -52,13 +53,11 @@ <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.api</artifactId> - <version>${version.chromattic}</version> </dependency>  <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.apt</artifactId> - <version>${version.chromattic}</version> <scope>provided</scope> </dependency> <dependency> Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-03-15 14:39:34 UTC (rev 6034) +++ components/wsrp/trunk/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -57,7 +58,7 @@ <version.javax.xml.ws>2.1</version.javax.xml.ws> <version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj> <version.google-collections>1.0</version.google-collections> - <version.chromattic>1.0.4</version.chromattic> + <version.chromattic>1.0.6</version.chromattic> </properties> <dependencyManagement> @@ -173,6 +174,18 @@ <version>${version.google-collections}</version> </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + <version>${version.chromattic}</version> + </dependency> + + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${version.chromattic}</version> + </dependency> + <!-- TODO: Need to investigate this plugin to speed up tests <dependency>

13 years, 3 months

1
0
0 / 0

gatein SVN: r6034 - portal/branches.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-15 10:39:34 -0400 (Tue, 15 Mar 2011) New Revision: 6034 Removed: portal/branches/wsrp-extraction/ Log: - Removed now unused wsrp-extraction branch.

13 years, 3 months

1
0
0 / 0

gatein SVN: r6033 - in portal/trunk: component and 48 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-15 10:23:31 -0400 (Tue, 15 Mar 2011) New Revision: 6033 Added: portal/trunk/wsrp-integration/ portal/trunk/wsrp-integration/extension-component/ portal/trunk/wsrp-integration/extension-component/pom.xml portal/trunk/wsrp-integration/extension-component/src/ portal/trunk/wsrp-integration/extension-component/src/main/ portal/trunk/wsrp-integration/extension-component/src/main/java/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java portal/trunk/wsrp-integration/extension-component/src/main/resources/ portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/ portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml portal/trunk/wsrp-integration/extension-component/src/test/ portal/trunk/wsrp-integration/extension-component/src/test/java/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java portal/trunk/wsrp-integration/extension-config/ portal/trunk/wsrp-integration/extension-config/pom.xml portal/trunk/wsrp-integration/extension-config/src/ portal/trunk/wsrp-integration/extension-config/src/main/ portal/trunk/wsrp-integration/extension-config/src/main/resources/ portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/ portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml portal/trunk/wsrp-integration/extension-ear/ portal/trunk/wsrp-integration/extension-ear/pom.xml portal/trunk/wsrp-integration/extension-ear/src/ portal/trunk/wsrp-integration/extension-ear/src/main/ portal/trunk/wsrp-integration/extension-ear/src/main/application/ portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/ portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml portal/trunk/wsrp-integration/extension-war/ portal/trunk/wsrp-integration/extension-war/pom.xml portal/trunk/wsrp-integration/extension-war/src/ portal/trunk/wsrp-integration/extension-war/src/main/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml portal/trunk/wsrp-integration/pom.xml Removed: portal/trunk/component/wsrp/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/ portal/trunk/wsrp-integration/extension-component/ portal/trunk/wsrp-integration/extension-component/pom.xml portal/trunk/wsrp-integration/extension-component/src/ portal/trunk/wsrp-integration/extension-component/src/main/ portal/trunk/wsrp-integration/extension-component/src/main/java/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java portal/trunk/wsrp-integration/extension-component/src/main/resources/ portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/ portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml portal/trunk/wsrp-integration/extension-component/src/test/ portal/trunk/wsrp-integration/extension-component/src/test/java/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java portal/trunk/wsrp-integration/extension-config/ portal/trunk/wsrp-integration/extension-config/pom.xml portal/trunk/wsrp-integration/extension-config/src/ portal/trunk/wsrp-integration/extension-config/src/main/ portal/trunk/wsrp-integration/extension-config/src/main/resources/ portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/ portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml portal/trunk/wsrp-integration/extension-ear/ portal/trunk/wsrp-integration/extension-ear/pom.xml portal/trunk/wsrp-integration/extension-ear/src/ portal/trunk/wsrp-integration/extension-ear/src/main/ portal/trunk/wsrp-integration/extension-ear/src/main/application/ portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/ portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml portal/trunk/wsrp-integration/extension-war/ portal/trunk/wsrp-integration/extension-war/pom.xml portal/trunk/wsrp-integration/extension-war/src/ portal/trunk/wsrp-integration/extension-war/src/main/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml portal/trunk/wsrp-integration/pom.xml Modified: portal/trunk/ portal/trunk/component/pom.xml portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/application.xml portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/packaging/reports/ portal/trunk/pom.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: - Merged wsrp-extraction branch back to trunk. (-r5827:6031) with the added fix to the package declaration in JBoss5WSSServiceIntegration which was improper (and yet, everything was building fine... -_-; ). - Note that this merge also contains the start of WS Security support in WSRP. Property changes on: portal/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /portal/branches/branch-GTNPORTAL-1790:5864-5919 /portal/branches/branch-GTNPORTAL-1822:5938-5991 + /portal/branches/branch-GTNPORTAL-1790:5864-5919 /portal/branches/branch-GTNPORTAL-1822:5938-5991 /portal/branches/wsrp-extraction:5828-6031 Modified: portal/trunk/component/pom.xml =================================================================== --- portal/trunk/component/pom.xml 2011-03-15 14:02:40 UTC (rev 6032) +++ portal/trunk/component/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -38,7 +38,6 @@ <module>test</module> <module>common</module> <module>pc</module> - <module>wsrp</module> <module>resources</module> <module>application-registry</module> <module>portal</module> Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-03-15 14:02:40 UTC (rev 6032) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -467,10 +467,6 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>gatein.portal.component.wsrp</artifactId> - </dependency>  <dependency> @@ -776,39 +772,7 @@ <version>1.2.3</version> </dependency> -  <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - - <dependency> <?context LIB?> <?move jcip-annotations.jar?> <groupId>net.jcip</groupId> @@ -895,21 +859,6 @@ <artifactId>gatein-sample-skin</artifactId> <type>war</type> </dependency> - <dependency> - <?move gatein.ear/wsrp-producer.war?> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - <type>war</type> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <?move gatein.ear/wsrp-admin-gui.war?> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <type>war</type> - <version>${org.gatein.wsrp.version}</version> - </dependency> - </dependencies> <build> Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/application.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/application.xml 2011-03-15 14:02:40 UTC (rev 6032) +++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/application.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -56,16 +56,4 @@ <context-root>web</context-root> </web> </module> - <module> - <web> - <web-uri>wsrp-admin-gui.war</web-uri> - <context-root>wsrp-admin-gui</context-root> - </web> - </module> - <module> - <web> - <web-uri>wsrp-producer.war</web-uri> - <context-root>wsrp-producer</context-root> - </web> - </module> </application> Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2011-03-15 14:02:40 UTC (rev 6032) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2011-03-15 14:23:31 UTC (rev 6033) @@ -41,7 +41,6 @@ var pcVersion = "${org.gatein.pc.version}"; var wciVersion = "${org.gatein.wci.version}"; var commonVersion = "${org.gatein.common.version}"; - var wsrpVersion = "${org.gatein.wsrp.version}"; var shindigVersion = "${org.shindig.version}"; var groovyVersion = "${org.codehaus.groovy.version}"; var rhinoVersion = "${rhino.version}"; @@ -79,17 +78,6 @@ addDependency(new Project("org.apache.portals.bridges", "portals-bridges-common", "jar", "1.0.4")). addDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA")); - - module.component.wsrp = new Project("org.exoplatform.portal", "gatein.portal.component.wsrp", "jar", module.version) - .addDependency(new Project("org.gatein.wsrp", "wsrp-producer", "war", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-admin-gui", "war", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-producer-lib", "jar",wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-common", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp1-ws", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp2-ws", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-consumer", "jar", wsrpVersion)) - .addDependency(new Project("org.gatein.wsrp", "wsrp-integration-api", "jar", wsrpVersion)); - module.component.scripting = new Project("org.exoplatform.portal", "exo.portal.component.scripting", "jar", module.version). addDependency(new Project("rhino", "js", "jar", rhinoVersion)). @@ -182,7 +170,6 @@ addDependency(module.component.resources). addDependency(module.component.identity). addDependency(module.component.pc). - addDependency(module.component.wsrp). addDependency(module.webui.eXo). addDependency(kernel.container). Property changes on: portal/trunk/packaging/reports ___________________________________________________________________ Modified: svn:ignore - *.iml .idea + .idea Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-03-15 14:02:40 UTC (rev 6032) +++ portal/trunk/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -48,7 +48,7 @@ <org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Alpha01</org.gatein.pc.version> <org.picketlink.idm>1.1.8.CR01</org.picketlink.idm> - <org.gatein.wsrp.version>2.0.0-GA</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.1.0-Alpha01</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.5-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> @@ -83,6 +83,7 @@ <module>starter</module> <module>packaging</module> <module>testsuite</module> + <module>wsrp-integration</module> </modules> <dependencyManagement> @@ -297,41 +298,75 @@ <version>${org.gatein.pc.version}</version> </dependency> <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> +  + <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> + <scope>provided</scope> <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> + <scope>provided</scope> <version>${org.gatein.wsrp.version}</version> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-integration-api</artifactId> + <scope>provided</scope> <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-api</artifactId> - <version>${org.gatein.mop.version}</version> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-spi</artifactId> - <version>${org.gatein.mop.version}</version> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> </dependency> <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-core</artifactId> - <version>${org.gatein.mop.version}</version> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + <scope>provided</scope> + <version>${org.gatein.wsrp.version}</version> + </dependency>  <dependency> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-03-15 14:02:40 UTC (rev 6032) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -27,7 +27,6 @@ <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/resource-compressor-configuration.xml</import> <import>war:/conf/common/portlet-container-configuration.xml</import> - <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> <import>war:/conf/common/logs-configuration.xml</import> <import>war:/conf/common/autologin-configuration.xml</import> <import>war:/conf/common/remindpwd-configuration.xml</import> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-03-15 14:02:40 UTC (rev 6032) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -33,13 +33,13 @@ <description>JCR configuration file</description> <value>war:/conf/jcr/repository-configuration.xml</value> </value-param> - <properties-param> +  </init-params> </component> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-03-15 14:02:40 UTC (rev 6032) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -224,141 +224,6 @@ </properties> </lock-manager> </workspace> - -  - <workspace name="wsrp-system"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="wsrp-system" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/> - <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" /> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> - </properties> - </lock-manager> - </workspace> - -  - <workspace name="pc-system"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/pc${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="pc-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/pc${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="${gatein.jcr.index.data.dir}/pc-system${container.name.suffix}"/> - <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> - <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/> - <property name="max-volatile-time" value="60"/> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m"/> - <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-pc-system"/> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> - <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - </properties> - </lock-manager> - </workspace> - </workspaces> </repository> </repositories> Property changes on: portal/trunk/wsrp-integration ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-component/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,129 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>1.0.0-Beta01-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>extension-component</artifactId> - <packaging>jar</packaging> - <name>GateIn WSRP Integration extension component</name> - - <dependencies> -  - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.pc</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-core</artifactId> - <version>3.1.2.GA</version> - <scope>provided</scope> - </dependency> - -  - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.8.5</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> - -</project> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-component/pom.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-component/pom.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>1.0.0-Beta01-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>extension-component</artifactId> + <packaging>jar</packaging> + <name>GateIn WSRP Integration extension component</name> + + <dependencies> +  + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-core</artifactId> + <version>3.1.2.GA</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.8.5</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + +</project> \ No newline at end of file Property changes on: portal/trunk/wsrp-integration/extension-component/src ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/main ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/java ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/java/org ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,109 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2011, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * 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. - */ - -package org.gatein.integration.wsrp; - -import org.exoplatform.container.PortalContainer; -import org.exoplatform.services.listener.Event; -import org.exoplatform.services.listener.Listener; -import org.gatein.wsrp.api.session.SessionEvent; -import org.gatein.wsrp.api.session.SessionEventBroadcaster; -import org.gatein.wsrp.api.session.SessionEventListener; - -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public class SessionEventListenerAndBroadcaster extends Listener<PortalContainer, HttpSessionEvent> implements SessionEventBroadcaster -{ - private Map<String, SessionEventListener> listeners = new ConcurrentHashMap<String, SessionEventListener>(); - private static final String SESSION_CREATED = "org.exoplatform.web.GenericHttpListener.sessionCreated"; - private static final String SESSION_DESTROYED = "org.exoplatform.web.GenericHttpListener.sessionDestroyed"; - - public void registerListener(String listenerId, SessionEventListener listener) - { - listeners.put(listenerId, listener); - } - - public void unregisterListener(String listenerId) - { - listeners.remove(listenerId); - } - - public void notifyListenersOf(SessionEvent event) - { - for (SessionEventListener listener : listeners.values()) - { - listener.onSessionEvent(event); - } - } - - @Override - public void onEvent(Event<PortalContainer, HttpSessionEvent> event) throws Exception - { - String eventName = event.getEventName(); - SessionEvent.SessionEventType eventType; - if (SESSION_CREATED.equals(eventName)) - { - eventType = SessionEvent.SessionEventType.SESSION_CREATED; - } - else if (SESSION_DESTROYED.equals(eventName)) - { - eventType = SessionEvent.SessionEventType.SESSION_DESTROYED; - } - else - { - // do nothing - return; - } - - notifyListenersOf(new SimpleSessionEvent(eventType, event.getData().getSession())); - } - - private static class SimpleSessionEvent implements SessionEvent - { - private SessionEventType eventType; - private HttpSession session; - - private SimpleSessionEvent(SessionEventType eventType, HttpSession session) - { - this.eventType = eventType; - this.session = session; - } - - public SessionEventType getType() - { - return eventType; - } - - public HttpSession getSession() - { - return session; - } - } -} Copied: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/SessionEventListenerAndBroadcaster.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,109 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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. + */ + +package org.gatein.integration.wsrp; + +import org.exoplatform.container.PortalContainer; +import org.exoplatform.services.listener.Event; +import org.exoplatform.services.listener.Listener; +import org.gatein.wsrp.api.session.SessionEvent; +import org.gatein.wsrp.api.session.SessionEventBroadcaster; +import org.gatein.wsrp.api.session.SessionEventListener; + +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionEvent; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class SessionEventListenerAndBroadcaster extends Listener<PortalContainer, HttpSessionEvent> implements SessionEventBroadcaster +{ + private Map<String, SessionEventListener> listeners = new ConcurrentHashMap<String, SessionEventListener>(); + private static final String SESSION_CREATED = "org.exoplatform.web.GenericHttpListener.sessionCreated"; + private static final String SESSION_DESTROYED = "org.exoplatform.web.GenericHttpListener.sessionDestroyed"; + + public void registerListener(String listenerId, SessionEventListener listener) + { + listeners.put(listenerId, listener); + } + + public void unregisterListener(String listenerId) + { + listeners.remove(listenerId); + } + + public void notifyListenersOf(SessionEvent event) + { + for (SessionEventListener listener : listeners.values()) + { + listener.onSessionEvent(event); + } + } + + @Override + public void onEvent(Event<PortalContainer, HttpSessionEvent> event) throws Exception + { + String eventName = event.getEventName(); + SessionEvent.SessionEventType eventType; + if (SESSION_CREATED.equals(eventName)) + { + eventType = SessionEvent.SessionEventType.SESSION_CREATED; + } + else if (SESSION_DESTROYED.equals(eventName)) + { + eventType = SessionEvent.SessionEventType.SESSION_DESTROYED; + } + else + { + // do nothing + return; + } + + notifyListenersOf(new SimpleSessionEvent(eventType, event.getData().getSession())); + } + + private static class SimpleSessionEvent implements SessionEvent + { + private SessionEventType eventType; + private HttpSession session; + + private SimpleSessionEvent(SessionEventType eventType, HttpSession session) + { + this.eventType = eventType; + this.session = session; + } + + public SessionEventType getType() + { + return eventType; + } + + public HttpSession getSession() + { + return session; + } + } +} Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,390 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2011, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * 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. - */ - -package org.gatein.integration.wsrp; - -import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.ExoContainerContext; -import org.exoplatform.container.configuration.ConfigurationManager; -import org.exoplatform.container.xml.InitParams; -import org.exoplatform.portal.config.DataStorage; -import org.exoplatform.portal.pc.ExoKernelIntegration; -import org.exoplatform.portal.pom.config.POMSessionManager; -import org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator; -import org.exoplatform.services.listener.ListenerService; -import org.gatein.common.logging.Logger; -import org.gatein.common.logging.LoggerFactory; -import org.gatein.integration.wsrp.jcr.JCRPersister; -import org.gatein.integration.wsrp.structure.MOPConsumerStructureProvider; -import org.gatein.integration.wsrp.structure.MOPPortalStructureAccess; -import org.gatein.integration.wsrp.structure.PortalStructureAccess; -import org.gatein.pc.api.PortletInvoker; -import org.gatein.pc.federation.FederatingPortletInvoker; -import org.gatein.pc.portlet.PortletInvokerInterceptor; -import org.gatein.pc.portlet.aspects.EventPayloadInterceptor; -import org.gatein.pc.portlet.container.ContainerPortletInvoker; -import org.gatein.pc.portlet.impl.state.StateConverterV0; -import org.gatein.pc.portlet.impl.state.StateManagementPolicyService; -import org.gatein.pc.portlet.state.StateConverter; -import org.gatein.pc.portlet.state.producer.PortletStatePersistenceManager; -import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker; -import org.gatein.registration.RegistrationManager; -import org.gatein.registration.RegistrationPersistenceManager; -import org.gatein.registration.impl.RegistrationManagerImpl; -import org.gatein.wci.ServletContainer; -import org.gatein.wci.ServletContainerFactory; -import org.gatein.wci.WebApp; -import org.gatein.wci.WebAppEvent; -import org.gatein.wci.WebAppLifeCycleEvent; -import org.gatein.wci.WebAppListener; -import org.gatein.wci.impl.DefaultServletContainerFactory; -import org.gatein.wsrp.WSRPConstants; -import org.gatein.wsrp.consumer.migration.JCRMigrationService; -import org.gatein.wsrp.consumer.migration.MigrationService; -import org.gatein.wsrp.consumer.registry.ActivatingNullInvokerHandler; -import org.gatein.wsrp.consumer.registry.ConsumerRegistry; -import org.gatein.wsrp.consumer.registry.JCRConsumerRegistry; -import org.gatein.wsrp.payload.WSRPEventPayloadInterceptor; -import org.gatein.wsrp.producer.ProducerHolder; -import org.gatein.wsrp.producer.WSRPProducer; -import org.gatein.wsrp.producer.config.JCRProducerConfigurationService; -import org.gatein.wsrp.producer.config.ProducerConfigurationService; -import org.gatein.wsrp.producer.invoker.RegistrationCheckingPortletInvoker; -import org.gatein.wsrp.producer.state.JCRPortletStatePersistenceManager; -import org.gatein.wsrp.registration.JCRRegistrationPersistenceManager; -import org.picocontainer.Startable; - -import javax.servlet.ServletContext; -import java.io.InputStream; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public class WSRPServiceIntegration implements Startable, WebAppListener -{ - private static final Logger log = LoggerFactory.getLogger(WSRPServiceIntegration.class); - - private static final String CLASSPATH = "classpath:/"; - private static final String PRODUCER_CONFIG_LOCATION = "producerConfigLocation"; - private static final String CONSUMERS_CONFIG_LOCATION = "consumersConfigLocation"; - - private final InputStream configurationIS; - private final String producerConfigLocation; - private WSRPProducer producer; - - private ConsumerRegistry consumerRegistry; - private ExoContainer container; - private final ExoKernelIntegration exoKernelIntegration; - private final boolean bypass; - private static final String WSRP_ADMIN_GUI_CONTEXT_PATH = "/wsrp-admin-gui"; - - public WSRPServiceIntegration(ExoContainerContext context, InitParams params, ConfigurationManager configurationManager, - ExoKernelIntegration pc, NodeHierarchyCreator nhc) throws Exception - { - // IMPORTANT: even though NodeHierarchyCreator is not used anywhere in the code, it's still needed for pico - // to properly make sure that this service is started after the PC one. Yes, Pico is crap. :/ - - // todo: we currently only allow the service to go through initialization if we are running in the default portal - // as this service is not meant to work with extensions yet... - String consumersConfigLocation; - if ("portal".equals(context.getName())) - { - if (params != null) - { - producerConfigLocation = params.getValueParam(PRODUCER_CONFIG_LOCATION).getValue(); - consumersConfigLocation = params.getValueParam(CONSUMERS_CONFIG_LOCATION).getValue(); - } - else - { - throw new IllegalArgumentException("Improperly configured service: missing values for " - + PRODUCER_CONFIG_LOCATION + "and " + CONSUMERS_CONFIG_LOCATION); - } - - configurationIS = configurationManager.getInputStream(CLASSPATH + producerConfigLocation); - - container = context.getContainer(); - - exoKernelIntegration = pc; - - bypass = false; - } - else - { - log.info("The WSRP service can only be started in the default portal context. WSRP was not started for '" - + context.getName() + "'"); - - producerConfigLocation = null; - consumersConfigLocation = null; - configurationIS = null; - exoKernelIntegration = null; - bypass = true; - } - } - - public void start() - { - if (!bypass) - { - startProducer(); - startConsumers(); - - // listen for web app events so that we can inject services into WSRP admin UI "cleanly" - // todo: this service injection should really be done using CDI... :/ - ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); - ServletContainer servletContainer = factory.getServletContainer(); - servletContainer.addWebAppListener(this); - - log.info("WSRP Service version '" + WSRPConstants.WSRP_SERVICE_VERSION + "' started"); - } - } - - private void startProducer() - { - - JCRProducerConfigurationService producerConfigurationService; - try - { - JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); - persister.initializeBuilderFor(JCRProducerConfigurationService.mappingClasses); - - producerConfigurationService = new JCRProducerConfigurationService(persister); - producerConfigurationService.setDefaultConfigurationIS(configurationIS); - producerConfigurationService.reloadConfiguration(); - } - catch (Exception e) - { - throw new RuntimeException("Couldn't load WSRP producer configuration from " + producerConfigLocation, e); - } - container.registerComponentInstance(ProducerConfigurationService.class, producerConfigurationService); - - RegistrationPersistenceManager registrationPersistenceManager; - try - { - JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); - persister.initializeBuilderFor(JCRRegistrationPersistenceManager.mappingClasses); - - registrationPersistenceManager = new JCRRegistrationPersistenceManager(persister); - } - catch (Exception e) - { - throw new RuntimeException("Couldn't instantiate RegistrationPersistenceManager", e); - } - RegistrationManager registrationManager = new RegistrationManagerImpl(); - registrationManager.setPersistenceManager(registrationPersistenceManager); - - // retrieve container portlet invoker from eXo kernel - ContainerPortletInvoker containerPortletInvoker = - (ContainerPortletInvoker)container.getComponentInstanceOfType(ContainerPortletInvoker.class); - - // iterate over the container stack so that we can insert the WSRP-specific event payload interceptor - PortletInvokerInterceptor previous = containerPortletInvoker; - PortletInvokerInterceptor next = previous; - do - { - PortletInvoker invoker = previous.getNext(); - if (invoker instanceof EventPayloadInterceptor) - { - // create a new WSRPEventPayloadInterceptor and make its next one the current event payload invoker - WSRPEventPayloadInterceptor eventPayloadInterceptor = new WSRPEventPayloadInterceptor(); - eventPayloadInterceptor.setNext(invoker); - - // replace the current event payload interceptor by the WSRP-specific one - previous.setNext(eventPayloadInterceptor); - - // we're done - break; - } - else - { - previous = next; - if (invoker instanceof PortletInvokerInterceptor) - { - next = (PortletInvokerInterceptor)invoker; - } - else - { - next = null; - } - } - } - while (next != null); - - // The producer persistence manager - PortletStatePersistenceManager producerPersistenceManager; - try - { - JCRPersister persister = new JCRPersister(container, JCRPersister.PORTLET_STATES_WORKSPACE_NAME); - persister.initializeBuilderFor(JCRPortletStatePersistenceManager.mappingClasses); - - producerPersistenceManager = new JCRPortletStatePersistenceManager(persister); - } - catch (Exception e) - { - throw new RuntimeException("Couldn't instantiate PortletStatePersistenceManager", e); - } - - // The producer state management policy - StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService(); - producerStateManagementPolicy.setPersistLocally(true); - - // The producer state converter - StateConverter producerStateConverter = new StateConverterV0(); - - // The producer portlet invoker - ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker(); - producerPortletInvoker.setNext(containerPortletInvoker); - producerPortletInvoker.setPersistenceManager(producerPersistenceManager); - producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); - producerPortletInvoker.setStateConverter(producerStateConverter); - - RegistrationCheckingPortletInvoker wsrpPortletInvoker = new RegistrationCheckingPortletInvoker(); - wsrpPortletInvoker.setNext(producerPortletInvoker); - wsrpPortletInvoker.setRegistrationManager(registrationManager); - - - // create and wire WSRP producer - producer = ProducerHolder.getProducer(true); - producer.setPortletInvoker(wsrpPortletInvoker); - producer.setRegistrationManager(registrationManager); - producer.setConfigurationService(producerConfigurationService); - exoKernelIntegration.getPortletApplicationRegistry().addListener(producer); - - producer.start(); - } - - private void startConsumers() - { - // retrieve federating portlet invoker from container - FederatingPortletInvoker federatingPortletInvoker = - (FederatingPortletInvoker)container.getComponentInstanceOfType(FederatingPortletInvoker.class); - - // add our Session event listener to the ListenerService for use in org.exoplatform.web.GenericHttpListener - ListenerService listenerService = (ListenerService)container.getComponentInstanceOfType(ListenerService.class); - SessionEventListenerAndBroadcaster sessionEventBroadcaster = new SessionEventListenerAndBroadcaster(); - - // events from org.exoplatform.web.GenericHttpListener - listenerService.addListener("org.exoplatform.web.GenericHttpListener.sessionCreated", sessionEventBroadcaster); - listenerService.addListener("org.exoplatform.web.GenericHttpListener.sessionDestroyed", sessionEventBroadcaster); - - try - { - JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); - persister.initializeBuilderFor(JCRConsumerRegistry.mappingClasses); - - consumerRegistry = new JCRConsumerRegistry(persister); - consumerRegistry.setFederatingPortletInvoker(federatingPortletInvoker); - consumerRegistry.setSessionEventBroadcaster(sessionEventBroadcaster); - - // create ConsumerStructureProvider and register it to listen to page events - POMSessionManager sessionManager = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - PortalStructureAccess structureAccess = new MOPPortalStructureAccess(sessionManager); - MOPConsumerStructureProvider structureprovider = new MOPConsumerStructureProvider(structureAccess); - listenerService.addListener(DataStorage.PAGE_CREATED, structureprovider); - listenerService.addListener(DataStorage.PAGE_REMOVED, structureprovider); - listenerService.addListener(DataStorage.PAGE_UPDATED, structureprovider); - - // migration service - persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); - persister.initializeBuilderFor(JCRMigrationService.mappingClasses); - - MigrationService migrationService = new JCRMigrationService(persister); - migrationService.setStructureProvider(structureprovider); - consumerRegistry.setMigrationService(migrationService); - - consumerRegistry.start(); - - // set up a NullInvokerHandler so that when a remote producer is queried, we can start it if needed - ActivatingNullInvokerHandler handler = new ActivatingNullInvokerHandler(); - handler.setConsumerRegistry(consumerRegistry); - federatingPortletInvoker.setNullInvokerHandler(handler); - } - catch (Exception e) - { - throw new RuntimeException("Couldn't start WSRP consumers registry.", e); - } - container.registerComponentInstance(ConsumerRegistry.class, consumerRegistry); - } - - public void stop() - { - if (!bypass) - { - // stop listening to web app events - ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); - ServletContainer servletContainer = factory.getServletContainer(); - servletContainer.removeWebAppListener(this); - - stopProducer(); - stopConsumers(); - } - } - - private void stopProducer() - { - producer.stop(); - - producer = null; - } - - private void stopConsumers() - { - try - { - consumerRegistry.stop(); - } - catch (Exception e) - { - throw new RuntimeException("Couldn't stop WSRP consumers registry.", e); - } - - consumerRegistry = null; - } - - public void onEvent(WebAppEvent event) - { - if (event instanceof WebAppLifeCycleEvent) - { - WebAppLifeCycleEvent lifeCycleEvent = (WebAppLifeCycleEvent)event; - WebApp webApp = event.getWebApp(); - ServletContext context = webApp.getServletContext(); - - // if we see the WSRP admin GUI being deployed or undeployed, inject or remove services - if (WSRP_ADMIN_GUI_CONTEXT_PATH.equals(webApp.getContextPath())) - { - switch (lifeCycleEvent.getType()) - { - case WebAppLifeCycleEvent.ADDED: - context.setAttribute("ConsumerRegistry", consumerRegistry); - context.setAttribute("ProducerConfigurationService", producer.getConfigurationService()); - break; - case WebAppLifeCycleEvent.REMOVED: - context.removeAttribute("ConsumerRegistry"); - context.removeAttribute("ProducerConfigurationService"); - break; - } - } - } - } - -} \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,390 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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. + */ + +package org.gatein.integration.wsrp; + +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.container.configuration.ConfigurationManager; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.pc.ExoKernelIntegration; +import org.exoplatform.portal.pom.config.POMSessionManager; +import org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator; +import org.exoplatform.services.listener.ListenerService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; +import org.gatein.integration.wsrp.jcr.JCRPersister; +import org.gatein.integration.wsrp.structure.MOPConsumerStructureProvider; +import org.gatein.integration.wsrp.structure.MOPPortalStructureAccess; +import org.gatein.integration.wsrp.structure.PortalStructureAccess; +import org.gatein.pc.api.PortletInvoker; +import org.gatein.pc.federation.FederatingPortletInvoker; +import org.gatein.pc.portlet.PortletInvokerInterceptor; +import org.gatein.pc.portlet.aspects.EventPayloadInterceptor; +import org.gatein.pc.portlet.container.ContainerPortletInvoker; +import org.gatein.pc.portlet.impl.state.StateConverterV0; +import org.gatein.pc.portlet.impl.state.StateManagementPolicyService; +import org.gatein.pc.portlet.state.StateConverter; +import org.gatein.pc.portlet.state.producer.PortletStatePersistenceManager; +import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker; +import org.gatein.registration.RegistrationManager; +import org.gatein.registration.RegistrationPersistenceManager; +import org.gatein.registration.impl.RegistrationManagerImpl; +import org.gatein.wci.ServletContainer; +import org.gatein.wci.ServletContainerFactory; +import org.gatein.wci.WebApp; +import org.gatein.wci.WebAppEvent; +import org.gatein.wci.WebAppLifeCycleEvent; +import org.gatein.wci.WebAppListener; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.gatein.wsrp.WSRPConstants; +import org.gatein.wsrp.consumer.migration.JCRMigrationService; +import org.gatein.wsrp.consumer.migration.MigrationService; +import org.gatein.wsrp.consumer.registry.ActivatingNullInvokerHandler; +import org.gatein.wsrp.consumer.registry.ConsumerRegistry; +import org.gatein.wsrp.consumer.registry.JCRConsumerRegistry; +import org.gatein.wsrp.payload.WSRPEventPayloadInterceptor; +import org.gatein.wsrp.producer.ProducerHolder; +import org.gatein.wsrp.producer.WSRPProducer; +import org.gatein.wsrp.producer.config.JCRProducerConfigurationService; +import org.gatein.wsrp.producer.config.ProducerConfigurationService; +import org.gatein.wsrp.producer.invoker.RegistrationCheckingPortletInvoker; +import org.gatein.wsrp.producer.state.JCRPortletStatePersistenceManager; +import org.gatein.wsrp.registration.JCRRegistrationPersistenceManager; +import org.picocontainer.Startable; + +import javax.servlet.ServletContext; +import java.io.InputStream; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class WSRPServiceIntegration implements Startable, WebAppListener +{ + private static final Logger log = LoggerFactory.getLogger(WSRPServiceIntegration.class); + + private static final String CLASSPATH = "classpath:/"; + private static final String PRODUCER_CONFIG_LOCATION = "producerConfigLocation"; + private static final String CONSUMERS_CONFIG_LOCATION = "consumersConfigLocation"; + + private final InputStream configurationIS; + private final String producerConfigLocation; + private WSRPProducer producer; + + private ConsumerRegistry consumerRegistry; + private ExoContainer container; + private final ExoKernelIntegration exoKernelIntegration; + private final boolean bypass; + private static final String WSRP_ADMIN_GUI_CONTEXT_PATH = "/wsrp-admin-gui"; + + public WSRPServiceIntegration(ExoContainerContext context, InitParams params, ConfigurationManager configurationManager, + ExoKernelIntegration pc, NodeHierarchyCreator nhc) throws Exception + { + // IMPORTANT: even though NodeHierarchyCreator is not used anywhere in the code, it's still needed for pico + // to properly make sure that this service is started after the PC one. Yes, Pico is crap. :/ + + // todo: we currently only allow the service to go through initialization if we are running in the default portal + // as this service is not meant to work with extensions yet... + String consumersConfigLocation; + if ("portal".equals(context.getName())) + { + if (params != null) + { + producerConfigLocation = params.getValueParam(PRODUCER_CONFIG_LOCATION).getValue(); + consumersConfigLocation = params.getValueParam(CONSUMERS_CONFIG_LOCATION).getValue(); + } + else + { + throw new IllegalArgumentException("Improperly configured service: missing values for " + + PRODUCER_CONFIG_LOCATION + "and " + CONSUMERS_CONFIG_LOCATION); + } + + configurationIS = configurationManager.getInputStream(CLASSPATH + producerConfigLocation); + + container = context.getContainer(); + + exoKernelIntegration = pc; + + bypass = false; + } + else + { + log.info("The WSRP service can only be started in the default portal context. WSRP was not started for '" + + context.getName() + "'"); + + producerConfigLocation = null; + consumersConfigLocation = null; + configurationIS = null; + exoKernelIntegration = null; + bypass = true; + } + } + + public void start() + { + if (!bypass) + { + startProducer(); + startConsumers(); + + // listen for web app events so that we can inject services into WSRP admin UI "cleanly" + // todo: this service injection should really be done using CDI... :/ + ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); + ServletContainer servletContainer = factory.getServletContainer(); + servletContainer.addWebAppListener(this); + + log.info("WSRP Service version '" + WSRPConstants.WSRP_SERVICE_VERSION + "' started"); + } + } + + private void startProducer() + { + + JCRProducerConfigurationService producerConfigurationService; + try + { + JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRProducerConfigurationService.mappingClasses); + + producerConfigurationService = new JCRProducerConfigurationService(persister); + producerConfigurationService.setDefaultConfigurationIS(configurationIS); + producerConfigurationService.reloadConfiguration(); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't load WSRP producer configuration from " + producerConfigLocation, e); + } + container.registerComponentInstance(ProducerConfigurationService.class, producerConfigurationService); + + RegistrationPersistenceManager registrationPersistenceManager; + try + { + JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRRegistrationPersistenceManager.mappingClasses); + + registrationPersistenceManager = new JCRRegistrationPersistenceManager(persister); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't instantiate RegistrationPersistenceManager", e); + } + RegistrationManager registrationManager = new RegistrationManagerImpl(); + registrationManager.setPersistenceManager(registrationPersistenceManager); + + // retrieve container portlet invoker from eXo kernel + ContainerPortletInvoker containerPortletInvoker = + (ContainerPortletInvoker)container.getComponentInstanceOfType(ContainerPortletInvoker.class); + + // iterate over the container stack so that we can insert the WSRP-specific event payload interceptor + PortletInvokerInterceptor previous = containerPortletInvoker; + PortletInvokerInterceptor next = previous; + do + { + PortletInvoker invoker = previous.getNext(); + if (invoker instanceof EventPayloadInterceptor) + { + // create a new WSRPEventPayloadInterceptor and make its next one the current event payload invoker + WSRPEventPayloadInterceptor eventPayloadInterceptor = new WSRPEventPayloadInterceptor(); + eventPayloadInterceptor.setNext(invoker); + + // replace the current event payload interceptor by the WSRP-specific one + previous.setNext(eventPayloadInterceptor); + + // we're done + break; + } + else + { + previous = next; + if (invoker instanceof PortletInvokerInterceptor) + { + next = (PortletInvokerInterceptor)invoker; + } + else + { + next = null; + } + } + } + while (next != null); + + // The producer persistence manager + PortletStatePersistenceManager producerPersistenceManager; + try + { + JCRPersister persister = new JCRPersister(container, JCRPersister.PORTLET_STATES_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRPortletStatePersistenceManager.mappingClasses); + + producerPersistenceManager = new JCRPortletStatePersistenceManager(persister); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't instantiate PortletStatePersistenceManager", e); + } + + // The producer state management policy + StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService(); + producerStateManagementPolicy.setPersistLocally(true); + + // The producer state converter + StateConverter producerStateConverter = new StateConverterV0(); + + // The producer portlet invoker + ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker(); + producerPortletInvoker.setNext(containerPortletInvoker); + producerPortletInvoker.setPersistenceManager(producerPersistenceManager); + producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); + producerPortletInvoker.setStateConverter(producerStateConverter); + + RegistrationCheckingPortletInvoker wsrpPortletInvoker = new RegistrationCheckingPortletInvoker(); + wsrpPortletInvoker.setNext(producerPortletInvoker); + wsrpPortletInvoker.setRegistrationManager(registrationManager); + + + // create and wire WSRP producer + producer = ProducerHolder.getProducer(true); + producer.setPortletInvoker(wsrpPortletInvoker); + producer.setRegistrationManager(registrationManager); + producer.setConfigurationService(producerConfigurationService); + exoKernelIntegration.getPortletApplicationRegistry().addListener(producer); + + producer.start(); + } + + private void startConsumers() + { + // retrieve federating portlet invoker from container + FederatingPortletInvoker federatingPortletInvoker = + (FederatingPortletInvoker)container.getComponentInstanceOfType(FederatingPortletInvoker.class); + + // add our Session event listener to the ListenerService for use in org.exoplatform.web.GenericHttpListener + ListenerService listenerService = (ListenerService)container.getComponentInstanceOfType(ListenerService.class); + SessionEventListenerAndBroadcaster sessionEventBroadcaster = new SessionEventListenerAndBroadcaster(); + + // events from org.exoplatform.web.GenericHttpListener + listenerService.addListener("org.exoplatform.web.GenericHttpListener.sessionCreated", sessionEventBroadcaster); + listenerService.addListener("org.exoplatform.web.GenericHttpListener.sessionDestroyed", sessionEventBroadcaster); + + try + { + JCRPersister persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRConsumerRegistry.mappingClasses); + + consumerRegistry = new JCRConsumerRegistry(persister); + consumerRegistry.setFederatingPortletInvoker(federatingPortletInvoker); + consumerRegistry.setSessionEventBroadcaster(sessionEventBroadcaster); + + // create ConsumerStructureProvider and register it to listen to page events + POMSessionManager sessionManager = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); + PortalStructureAccess structureAccess = new MOPPortalStructureAccess(sessionManager); + MOPConsumerStructureProvider structureprovider = new MOPConsumerStructureProvider(structureAccess); + listenerService.addListener(DataStorage.PAGE_CREATED, structureprovider); + listenerService.addListener(DataStorage.PAGE_REMOVED, structureprovider); + listenerService.addListener(DataStorage.PAGE_UPDATED, structureprovider); + + // migration service + persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME); + persister.initializeBuilderFor(JCRMigrationService.mappingClasses); + + MigrationService migrationService = new JCRMigrationService(persister); + migrationService.setStructureProvider(structureprovider); + consumerRegistry.setMigrationService(migrationService); + + consumerRegistry.start(); + + // set up a NullInvokerHandler so that when a remote producer is queried, we can start it if needed + ActivatingNullInvokerHandler handler = new ActivatingNullInvokerHandler(); + handler.setConsumerRegistry(consumerRegistry); + federatingPortletInvoker.setNullInvokerHandler(handler); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't start WSRP consumers registry.", e); + } + container.registerComponentInstance(ConsumerRegistry.class, consumerRegistry); + } + + public void stop() + { + if (!bypass) + { + // stop listening to web app events + ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); + ServletContainer servletContainer = factory.getServletContainer(); + servletContainer.removeWebAppListener(this); + + stopProducer(); + stopConsumers(); + } + } + + private void stopProducer() + { + producer.stop(); + + producer = null; + } + + private void stopConsumers() + { + try + { + consumerRegistry.stop(); + } + catch (Exception e) + { + throw new RuntimeException("Couldn't stop WSRP consumers registry.", e); + } + + consumerRegistry = null; + } + + public void onEvent(WebAppEvent event) + { + if (event instanceof WebAppLifeCycleEvent) + { + WebAppLifeCycleEvent lifeCycleEvent = (WebAppLifeCycleEvent)event; + WebApp webApp = event.getWebApp(); + ServletContext context = webApp.getServletContext(); + + // if we see the WSRP admin GUI being deployed or undeployed, inject or remove services + if (WSRP_ADMIN_GUI_CONTEXT_PATH.equals(webApp.getContextPath())) + { + switch (lifeCycleEvent.getType()) + { + case WebAppLifeCycleEvent.ADDED: + context.setAttribute("ConsumerRegistry", consumerRegistry); + context.setAttribute("ProducerConfigurationService", producer.getConfigurationService()); + break; + case WebAppLifeCycleEvent.REMOVED: + context.removeAttribute("ConsumerRegistry"); + context.removeAttribute("ProducerConfigurationService"); + break; + } + } + } + } + +} \ No newline at end of file Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,344 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2011, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * 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. - */ - -package org.gatein.integration.wsrp.jcr; - -import org.chromattic.api.Chromattic; -import org.chromattic.api.ChromatticBuilder; -import org.chromattic.api.ChromatticSession; -import org.chromattic.api.format.FormatterContext; -import org.chromattic.api.format.ObjectFormatter; -import org.chromattic.spi.jcr.SessionLifeCycle; -import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.ExoContainerContext; -import org.exoplatform.services.jcr.RepositoryService; -import org.exoplatform.services.jcr.core.ManageableRepository; -import org.exoplatform.services.jcr.ext.common.SessionProvider; -import org.gatein.common.util.ParameterValidation; -import org.gatein.wsrp.jcr.ChromatticPersister; -import org.gatein.wsrp.jcr.mapping.BaseMapping; - -import javax.jcr.Credentials; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public class JCRPersister implements ChromatticPersister -{ - private Chromattic chrome; - public static final String WSRP_WORKSPACE_NAME = "wsrp-system"; - public static final String PORTLET_STATES_WORKSPACE_NAME = "pc-system"; - private static final String REPOSITORY_NAME = "repository"; - private String workspaceName; - private Map<Class, Class<? extends BaseMapping>> modelToMapping; - - private ThreadLocal<ChromatticSession> sessionHolder = new ThreadLocal<ChromatticSession>(); - - public JCRPersister(ExoContainer container, String workspaceName) - { - this.workspaceName = workspaceName; - } - - public void initializeBuilderFor(List<Class> mappingClasses) throws Exception - { - ChromatticBuilder builder = ChromatticBuilder.create(); - builder.setOptionValue(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl"); - if (PORTLET_STATES_WORKSPACE_NAME.equals(workspaceName)) - { - builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortletStatesSessionLifeCycle.class.getName()); - } - else if (WSRP_WORKSPACE_NAME.equals(workspaceName)) - { - builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, WSRPSessionLifeCycle.class.getName()); - } - else - { - throw new IllegalArgumentException("Unknown workspace name: '" + workspaceName + "'"); - } - - modelToMapping = new HashMap<Class, Class<? extends BaseMapping>>(mappingClasses.size()); - for (Class mappingClass : mappingClasses) - { - if (BaseMapping.class.isAssignableFrom(mappingClass)) - { - Type[] interfaces = mappingClass.getGenericInterfaces(); - if (ParameterValidation.existsAndIsNotEmpty(interfaces)) - { - Class type = (Class)((ParameterizedType)interfaces[0]).getActualTypeArguments()[0]; - modelToMapping.put(type, mappingClass); - } - } - builder.add(mappingClass); - } - - chrome = builder.build(); - } - - public ChromatticSession getSession() - { - ChromatticSession chromatticSession = sessionHolder.get(); - if (chromatticSession == null) - { - ChromatticSession session = chrome.openSession(); - sessionHolder.set(session); - return session; - } - else - { - return chromatticSession; - } - } - - public void closeSession(boolean save) - { - ChromatticSession session = getOpenedSessionOrFail(); - if (save) - { - synchronized (this) - { - session.save(); - } - } - session.close(); - sessionHolder.set(null); - } - - private ChromatticSession getOpenedSessionOrFail() - { - ChromatticSession session = sessionHolder.get(); - if (session == null) - { - throw new IllegalStateException("Cannot close the session as it hasn't been opened first!"); - } - return session; - } - - public synchronized void save() - { - getOpenedSessionOrFail().save(); - } - - public <T> boolean delete(T toDelete, org.gatein.wsrp.jcr.StoresByPathManager<T> manager) - { - Class<? extends Object> modelClass = toDelete.getClass(); - Class<? extends BaseMapping> baseMappingClass = modelToMapping.get(modelClass); - if (baseMappingClass == null) - { - throw new IllegalArgumentException("Cannot find a mapping class for " + modelClass.getName()); - } - - ChromatticSession session = getSession(); - - Object old = session.findByPath(baseMappingClass, manager.getChildPath(toDelete)); - - if (old != null) - { - session.remove(old); - closeSession(true); - return true; - } - else - { - closeSession(false); - return false; - } - } - - public static class WSRPSessionLifeCycle implements SessionLifeCycle - { - private ManageableRepository repository; - private SessionProvider provider; - - public WSRPSessionLifeCycle() - { - try - { - ExoContainer container = ExoContainerContext.getCurrentContainer(); - RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class); - repository = repoService.getRepository(REPOSITORY_NAME); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - - provider = SessionProvider.createSystemProvider(); - } - - public Session login() throws RepositoryException - { - return provider.getSession(WSRP_WORKSPACE_NAME, repository); - } - - public Session login(String s) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public Session login(Credentials credentials, String s) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public Session login(Credentials credentials) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public void save(Session session) throws RepositoryException - { - session.save(); - } - - public void close(Session session) - { - session.logout(); - } - } - - public static class PortletStatesSessionLifeCycle implements SessionLifeCycle - { - private ManageableRepository repository; - private SessionProvider provider; - - public PortletStatesSessionLifeCycle() - { - try - { - ExoContainer container = ExoContainerContext.getCurrentContainer(); - RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class); - repository = repoService.getRepository(REPOSITORY_NAME); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - - provider = SessionProvider.createSystemProvider(); - } - - public Session login() throws RepositoryException - { - return provider.getSession(PORTLET_STATES_WORKSPACE_NAME, repository); - } - - public Session login(String s) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public Session login(Credentials credentials, String s) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public Session login(Credentials credentials) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public void save(Session session) throws RepositoryException - { - session.save(); - } - - public void close(Session session) - { - session.logout(); - } - } - - public static class QNameFormatter implements ObjectFormatter - { - private static final String OPEN_BRACE_REPLACEMENT = "-__"; - private static final String CLOSE_BRACE_REPLACEMENT = "__-"; - private static final String COLON_REPLACEMENT = "_-_"; - private static final String CLOSE_BRACE = "}"; - private static final String OPEN_BRACE = "{"; - private static final String COLON = ":"; - - public String decodeNodeName(FormatterContext formatterContext, String s) - { - return decode(s); - } - - public String encodeNodeName(FormatterContext formatterContext, String s) - { - return encode(s); - } - - public String decodePropertyName(FormatterContext formatterContext, String s) - { - return decode(s); - } - - public String encodePropertyName(FormatterContext formatterContext, String s) - { - return encode(s); - } - - public static String decode(String s) - { - return s.replace(CLOSE_BRACE_REPLACEMENT, CLOSE_BRACE).replace(OPEN_BRACE_REPLACEMENT, OPEN_BRACE).replace(COLON_REPLACEMENT, COLON); - } - - public static String encode(String s) - { - return s.replace(OPEN_BRACE, OPEN_BRACE_REPLACEMENT).replace(CLOSE_BRACE, CLOSE_BRACE_REPLACEMENT).replace(COLON, COLON_REPLACEMENT); - } - } - - public static class PortletNameFormatter implements ObjectFormatter - { - public static final String SLASH_REPLACEMENT = "-_-"; - private static final String SLASH = "/"; - - public String decodeNodeName(FormatterContext formatterContext, String s) - { - return decode(s); - } - - public static String decode(String s) - { - return s.replace(SLASH_REPLACEMENT, SLASH); - } - - public String encodeNodeName(FormatterContext formatterContext, String s) throws IllegalArgumentException, NullPointerException - { - return encode(s); - } - - public static String encode(String s) - { - return s.replace(SLASH, SLASH_REPLACEMENT); - } - } -} Copied: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,344 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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. + */ + +package org.gatein.integration.wsrp.jcr; + +import org.chromattic.api.Chromattic; +import org.chromattic.api.ChromatticBuilder; +import org.chromattic.api.ChromatticSession; +import org.chromattic.api.format.FormatterContext; +import org.chromattic.api.format.ObjectFormatter; +import org.chromattic.spi.jcr.SessionLifeCycle; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.services.jcr.RepositoryService; +import org.exoplatform.services.jcr.core.ManageableRepository; +import org.exoplatform.services.jcr.ext.common.SessionProvider; +import org.gatein.common.util.ParameterValidation; +import org.gatein.wsrp.jcr.ChromatticPersister; +import org.gatein.wsrp.jcr.mapping.BaseMapping; + +import javax.jcr.Credentials; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class JCRPersister implements ChromatticPersister +{ + private Chromattic chrome; + public static final String WSRP_WORKSPACE_NAME = "wsrp-system"; + public static final String PORTLET_STATES_WORKSPACE_NAME = "pc-system"; + private static final String REPOSITORY_NAME = "repository"; + private String workspaceName; + private Map<Class, Class<? extends BaseMapping>> modelToMapping; + + private ThreadLocal<ChromatticSession> sessionHolder = new ThreadLocal<ChromatticSession>(); + + public JCRPersister(ExoContainer container, String workspaceName) + { + this.workspaceName = workspaceName; + } + + public void initializeBuilderFor(List<Class> mappingClasses) throws Exception + { + ChromatticBuilder builder = ChromatticBuilder.create(); + builder.setOptionValue(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl"); + if (PORTLET_STATES_WORKSPACE_NAME.equals(workspaceName)) + { + builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortletStatesSessionLifeCycle.class.getName()); + } + else if (WSRP_WORKSPACE_NAME.equals(workspaceName)) + { + builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, WSRPSessionLifeCycle.class.getName()); + } + else + { + throw new IllegalArgumentException("Unknown workspace name: '" + workspaceName + "'"); + } + + modelToMapping = new HashMap<Class, Class<? extends BaseMapping>>(mappingClasses.size()); + for (Class mappingClass : mappingClasses) + { + if (BaseMapping.class.isAssignableFrom(mappingClass)) + { + Type[] interfaces = mappingClass.getGenericInterfaces(); + if (ParameterValidation.existsAndIsNotEmpty(interfaces)) + { + Class type = (Class)((ParameterizedType)interfaces[0]).getActualTypeArguments()[0]; + modelToMapping.put(type, mappingClass); + } + } + builder.add(mappingClass); + } + + chrome = builder.build(); + } + + public ChromatticSession getSession() + { + ChromatticSession chromatticSession = sessionHolder.get(); + if (chromatticSession == null) + { + ChromatticSession session = chrome.openSession(); + sessionHolder.set(session); + return session; + } + else + { + return chromatticSession; + } + } + + public void closeSession(boolean save) + { + ChromatticSession session = getOpenedSessionOrFail(); + if (save) + { + synchronized (this) + { + session.save(); + } + } + session.close(); + sessionHolder.set(null); + } + + private ChromatticSession getOpenedSessionOrFail() + { + ChromatticSession session = sessionHolder.get(); + if (session == null) + { + throw new IllegalStateException("Cannot close the session as it hasn't been opened first!"); + } + return session; + } + + public synchronized void save() + { + getOpenedSessionOrFail().save(); + } + + public <T> boolean delete(T toDelete, org.gatein.wsrp.jcr.StoresByPathManager<T> manager) + { + Class<? extends Object> modelClass = toDelete.getClass(); + Class<? extends BaseMapping> baseMappingClass = modelToMapping.get(modelClass); + if (baseMappingClass == null) + { + throw new IllegalArgumentException("Cannot find a mapping class for " + modelClass.getName()); + } + + ChromatticSession session = getSession(); + + Object old = session.findByPath(baseMappingClass, manager.getChildPath(toDelete)); + + if (old != null) + { + session.remove(old); + closeSession(true); + return true; + } + else + { + closeSession(false); + return false; + } + } + + public static class WSRPSessionLifeCycle implements SessionLifeCycle + { + private ManageableRepository repository; + private SessionProvider provider; + + public WSRPSessionLifeCycle() + { + try + { + ExoContainer container = ExoContainerContext.getCurrentContainer(); + RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class); + repository = repoService.getRepository(REPOSITORY_NAME); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + + provider = SessionProvider.createSystemProvider(); + } + + public Session login() throws RepositoryException + { + return provider.getSession(WSRP_WORKSPACE_NAME, repository); + } + + public Session login(String s) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public Session login(Credentials credentials, String s) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public Session login(Credentials credentials) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public void save(Session session) throws RepositoryException + { + session.save(); + } + + public void close(Session session) + { + session.logout(); + } + } + + public static class PortletStatesSessionLifeCycle implements SessionLifeCycle + { + private ManageableRepository repository; + private SessionProvider provider; + + public PortletStatesSessionLifeCycle() + { + try + { + ExoContainer container = ExoContainerContext.getCurrentContainer(); + RepositoryService repoService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class); + repository = repoService.getRepository(REPOSITORY_NAME); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + + provider = SessionProvider.createSystemProvider(); + } + + public Session login() throws RepositoryException + { + return provider.getSession(PORTLET_STATES_WORKSPACE_NAME, repository); + } + + public Session login(String s) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public Session login(Credentials credentials, String s) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public Session login(Credentials credentials) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public void save(Session session) throws RepositoryException + { + session.save(); + } + + public void close(Session session) + { + session.logout(); + } + } + + public static class QNameFormatter implements ObjectFormatter + { + private static final String OPEN_BRACE_REPLACEMENT = "-__"; + private static final String CLOSE_BRACE_REPLACEMENT = "__-"; + private static final String COLON_REPLACEMENT = "_-_"; + private static final String CLOSE_BRACE = "}"; + private static final String OPEN_BRACE = "{"; + private static final String COLON = ":"; + + public String decodeNodeName(FormatterContext formatterContext, String s) + { + return decode(s); + } + + public String encodeNodeName(FormatterContext formatterContext, String s) + { + return encode(s); + } + + public String decodePropertyName(FormatterContext formatterContext, String s) + { + return decode(s); + } + + public String encodePropertyName(FormatterContext formatterContext, String s) + { + return encode(s); + } + + public static String decode(String s) + { + return s.replace(CLOSE_BRACE_REPLACEMENT, CLOSE_BRACE).replace(OPEN_BRACE_REPLACEMENT, OPEN_BRACE).replace(COLON_REPLACEMENT, COLON); + } + + public static String encode(String s) + { + return s.replace(OPEN_BRACE, OPEN_BRACE_REPLACEMENT).replace(CLOSE_BRACE, CLOSE_BRACE_REPLACEMENT).replace(COLON, COLON_REPLACEMENT); + } + } + + public static class PortletNameFormatter implements ObjectFormatter + { + public static final String SLASH_REPLACEMENT = "-_-"; + private static final String SLASH = "/"; + + public String decodeNodeName(FormatterContext formatterContext, String s) + { + return decode(s); + } + + public static String decode(String s) + { + return s.replace(SLASH_REPLACEMENT, SLASH); + } + + public String encodeNodeName(FormatterContext formatterContext, String s) throws IllegalArgumentException, NullPointerException + { + return encode(s); + } + + public static String encode(String s) + { + return s.replace(SLASH, SLASH_REPLACEMENT); + } + } +} Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,308 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2011, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * 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. - */ - -package org.gatein.integration.wsrp.structure; - -import org.exoplatform.portal.config.DataStorage; -import org.exoplatform.portal.mop.Described; -import org.exoplatform.portal.pom.spi.wsrp.WSRP; -import org.exoplatform.services.listener.Event; -import org.exoplatform.services.listener.Listener; -import org.gatein.common.util.ParameterValidation; -import org.gatein.mop.api.content.Customization; -import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.Page; -import org.gatein.mop.api.workspace.ui.UIComponent; -import org.gatein.mop.api.workspace.ui.UIContainer; -import org.gatein.mop.api.workspace.ui.UIWindow; -import org.gatein.pc.api.PortletContext; -import org.gatein.pc.api.PortletStateType; -import org.gatein.pc.api.StatefulPortletContext; -import org.gatein.wsrp.api.context.ConsumerStructureProvider; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public class MOPConsumerStructureProvider extends Listener<DataStorage, org.exoplatform.portal.config.model.Page> implements ConsumerStructureProvider -{ - private final PortalStructureAccess structureAccess; - private Map<String, PageInfo> pageInfos; - private boolean pagesHaveBeenInitialized; - - public MOPConsumerStructureProvider(PortalStructureAccess structureAccess) - { - ParameterValidation.throwIllegalArgExceptionIfNull(structureAccess, "PortalStructureAccess"); - - this.structureAccess = structureAccess; - pageInfos = new HashMap<String, PageInfo>(); - } - - public List<String> getPageIdentifiers() - { - if (!pagesHaveBeenInitialized) - { - // initialize page information - Collection<Page> pages = structureAccess.getPages(); - for (Page page : pages) - { - addPage(page); - } - - pagesHaveBeenInitialized = true; - } - - LinkedList<String> identifiers = new LinkedList<String>(pageInfos.keySet()); - Collections.sort(identifiers); - return identifiers; - } - - private void addPage(Page page) - { - Described described = page.adapt(Described.class); - PageInfo pageInfo = new PageInfo(page.getObjectId(), described.getName(), page.getName()); - pageInfos.put(pageInfo.getName(), pageInfo); - UIContainer container = page.getRootComponent(); - processContainer(container, pageInfo); - - Collection<Page> children = page.getChildren(); - if (ParameterValidation.existsAndIsNotEmpty(children)) - { - for (Page child : children) - { - addPage(child); - } - } - } - - public List<String> getWindowIdentifiersFor(String pageId) - { - PageInfo pageInfo = pageInfos.get(pageId); - if (pageInfo == null) - { - throw new IllegalArgumentException("Page '" + pageId + "' does not exist."); - } - - return pageInfo.getChildrenWindows(); - } - - private void processContainer(UIContainer container, PageInfo pageInfo) - { - if (container != null) - { - List<UIComponent> components = container.getComponents(); - for (UIComponent component : components) - { - ObjectType<? extends UIComponent> type = component.getObjectType(); - if (ObjectType.WINDOW.equals(type)) - { - Described described = component.adapt(Described.class); - String name = described.getName(); - - pageInfo.addWindow(name, component.getObjectId()); - } - else if (ObjectType.CONTAINER.equals(type)) - { - processContainer((UIContainer)component, pageInfo); - } - else - { - // ignore - } - } - } - } - - public void assignPortletToWindow(PortletContext portletContext, String windowId, String pageId, String exportedPortletHandle) - { - PageInfo pageInfo = pageInfos.get(pageId); - String uuid = pageInfo.getWindowUUID(windowId); - ParameterValidation.throwIllegalArgExceptionIfNull(uuid, "UUID for " + windowId); - - // get the window - UIWindow window = structureAccess.getWindowFrom(uuid); - - // construct the new customization state - WSRP wsrp = new WSRP(); - String portletId = portletContext.getId(); - wsrp.setPortletId(portletId); - if (portletContext instanceof StatefulPortletContext) - { - StatefulPortletContext context = (StatefulPortletContext)portletContext; - if (PortletStateType.OPAQUE.equals(context.getType())) - { - wsrp.setState((byte[])context.getState()); - } - else - { - throw new IllegalArgumentException("Don't know how to deal with state: " + context.getState()); - } - } - - // destroy existing customization as otherwise re-customizing will fail - Customization<?> customization = window.getCustomization(); - customization.destroy(); - - // and re-customize - window.customize(WSRP.CONTENT_TYPE, portletId, wsrp); - - // Change the window's name so that it's less confusing to users - Described described = window.adapt(Described.class); - String newName = exportedPortletHandle + " (remote)"; - described.setName(newName); // should be the same as ApplicationRegistryService.REMOTE_DISPLAY_NAME_SUFFIX - - // update window mappings - pageInfo.updateWindowName(windowId, newName); - - structureAccess.saveChangesTo(window); - } - - @Override - public void onEvent(Event<DataStorage, org.exoplatform.portal.config.model.Page> event) throws Exception - { - String eventName = event.getEventName(); - - // get the MOP page from the event data - org.exoplatform.portal.config.model.Page portalPage = event.getData(); - Page page = structureAccess.getPageFrom(portalPage); - - if (page == null && DataStorage.PAGE_REMOVED.equals(eventName)) - { - // if we try to remove a page, when we get this event, the page has already been removed from JCR - // so we need to work around that fact by retrieving the corresponding PageInfo from the portal page title - // which should match the Described name and check that it matches the internal name before removing it - removePage(portalPage.getTitle(), portalPage.getName()); - - return; - } - - if (page != null) - { - if (DataStorage.PAGE_CREATED.equals(eventName)) - { - // add information for new page - addPage(page); - } - else if (DataStorage.PAGE_UPDATED.equals(eventName)) - { - removePage(page); - addPage(page); - } - } - } - - private void removePage(Page page) - { - Described described = page.adapt(Described.class); - String name = described.getName(); - - removePage(name, page.getName()); - } - - private void removePage(String name, String internalName) - { - PageInfo pageInfo = pageInfos.get(name); - if (pageInfo != null && internalName.equals(pageInfo.getInternalName())) - { - // remove page info - pageInfos.remove(name); - } - } - - private static class PageInfo - { - private final String uuid; - private final Map<String, String> childrenWindows = new HashMap<String, String>(); - - /** Name as provided by Described */ - private final String name; - - /** Name as automatically generated */ - private final String internalName; - - private PageInfo(String uuid, String name, String internalName) - { - this.uuid = uuid; - this.name = name; - this.internalName = internalName; - } - - public String getUUID() - { - return uuid; - } - - public String getInternalName() - { - return internalName; - } - - public List<String> getChildrenWindows() - { - return new ArrayList<String>(childrenWindows.keySet()); - } - - public void addWindow(String windowName, String uuid) - { - // add suffix in case we have several windows with the same name in the page - if (childrenWindows.containsKey(windowName)) - { - if (windowName.endsWith("|")) - { - windowName += "|"; - } - else - { - windowName += windowName + " |"; - } - } - - childrenWindows.put(windowName, uuid); - } - - public void updateWindowName(String oldWindowName, String newWindowName) - { - String windowUUID = getWindowUUID(oldWindowName); - childrenWindows.remove(oldWindowName); - childrenWindows.put(newWindowName, windowUUID); - } - - public String getName() - { - return name; - } - - public String getWindowUUID(String windowId) - { - return childrenWindows.get(windowId); - } - } -} Copied: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,308 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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. + */ + +package org.gatein.integration.wsrp.structure; + +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.mop.Described; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; +import org.exoplatform.services.listener.Event; +import org.exoplatform.services.listener.Listener; +import org.gatein.common.util.ParameterValidation; +import org.gatein.mop.api.content.Customization; +import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.workspace.Page; +import org.gatein.mop.api.workspace.ui.UIComponent; +import org.gatein.mop.api.workspace.ui.UIContainer; +import org.gatein.mop.api.workspace.ui.UIWindow; +import org.gatein.pc.api.PortletContext; +import org.gatein.pc.api.PortletStateType; +import org.gatein.pc.api.StatefulPortletContext; +import org.gatein.wsrp.api.context.ConsumerStructureProvider; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class MOPConsumerStructureProvider extends Listener<DataStorage, org.exoplatform.portal.config.model.Page> implements ConsumerStructureProvider +{ + private final PortalStructureAccess structureAccess; + private Map<String, PageInfo> pageInfos; + private boolean pagesHaveBeenInitialized; + + public MOPConsumerStructureProvider(PortalStructureAccess structureAccess) + { + ParameterValidation.throwIllegalArgExceptionIfNull(structureAccess, "PortalStructureAccess"); + + this.structureAccess = structureAccess; + pageInfos = new HashMap<String, PageInfo>(); + } + + public List<String> getPageIdentifiers() + { + if (!pagesHaveBeenInitialized) + { + // initialize page information + Collection<Page> pages = structureAccess.getPages(); + for (Page page : pages) + { + addPage(page); + } + + pagesHaveBeenInitialized = true; + } + + LinkedList<String> identifiers = new LinkedList<String>(pageInfos.keySet()); + Collections.sort(identifiers); + return identifiers; + } + + private void addPage(Page page) + { + Described described = page.adapt(Described.class); + PageInfo pageInfo = new PageInfo(page.getObjectId(), described.getName(), page.getName()); + pageInfos.put(pageInfo.getName(), pageInfo); + UIContainer container = page.getRootComponent(); + processContainer(container, pageInfo); + + Collection<Page> children = page.getChildren(); + if (ParameterValidation.existsAndIsNotEmpty(children)) + { + for (Page child : children) + { + addPage(child); + } + } + } + + public List<String> getWindowIdentifiersFor(String pageId) + { + PageInfo pageInfo = pageInfos.get(pageId); + if (pageInfo == null) + { + throw new IllegalArgumentException("Page '" + pageId + "' does not exist."); + } + + return pageInfo.getChildrenWindows(); + } + + private void processContainer(UIContainer container, PageInfo pageInfo) + { + if (container != null) + { + List<UIComponent> components = container.getComponents(); + for (UIComponent component : components) + { + ObjectType<? extends UIComponent> type = component.getObjectType(); + if (ObjectType.WINDOW.equals(type)) + { + Described described = component.adapt(Described.class); + String name = described.getName(); + + pageInfo.addWindow(name, component.getObjectId()); + } + else if (ObjectType.CONTAINER.equals(type)) + { + processContainer((UIContainer)component, pageInfo); + } + else + { + // ignore + } + } + } + } + + public void assignPortletToWindow(PortletContext portletContext, String windowId, String pageId, String exportedPortletHandle) + { + PageInfo pageInfo = pageInfos.get(pageId); + String uuid = pageInfo.getWindowUUID(windowId); + ParameterValidation.throwIllegalArgExceptionIfNull(uuid, "UUID for " + windowId); + + // get the window + UIWindow window = structureAccess.getWindowFrom(uuid); + + // construct the new customization state + WSRP wsrp = new WSRP(); + String portletId = portletContext.getId(); + wsrp.setPortletId(portletId); + if (portletContext instanceof StatefulPortletContext) + { + StatefulPortletContext context = (StatefulPortletContext)portletContext; + if (PortletStateType.OPAQUE.equals(context.getType())) + { + wsrp.setState((byte[])context.getState()); + } + else + { + throw new IllegalArgumentException("Don't know how to deal with state: " + context.getState()); + } + } + + // destroy existing customization as otherwise re-customizing will fail + Customization<?> customization = window.getCustomization(); + customization.destroy(); + + // and re-customize + window.customize(WSRP.CONTENT_TYPE, portletId, wsrp); + + // Change the window's name so that it's less confusing to users + Described described = window.adapt(Described.class); + String newName = exportedPortletHandle + " (remote)"; + described.setName(newName); // should be the same as ApplicationRegistryService.REMOTE_DISPLAY_NAME_SUFFIX + + // update window mappings + pageInfo.updateWindowName(windowId, newName); + + structureAccess.saveChangesTo(window); + } + + @Override + public void onEvent(Event<DataStorage, org.exoplatform.portal.config.model.Page> event) throws Exception + { + String eventName = event.getEventName(); + + // get the MOP page from the event data + org.exoplatform.portal.config.model.Page portalPage = event.getData(); + Page page = structureAccess.getPageFrom(portalPage); + + if (page == null && DataStorage.PAGE_REMOVED.equals(eventName)) + { + // if we try to remove a page, when we get this event, the page has already been removed from JCR + // so we need to work around that fact by retrieving the corresponding PageInfo from the portal page title + // which should match the Described name and check that it matches the internal name before removing it + removePage(portalPage.getTitle(), portalPage.getName()); + + return; + } + + if (page != null) + { + if (DataStorage.PAGE_CREATED.equals(eventName)) + { + // add information for new page + addPage(page); + } + else if (DataStorage.PAGE_UPDATED.equals(eventName)) + { + removePage(page); + addPage(page); + } + } + } + + private void removePage(Page page) + { + Described described = page.adapt(Described.class); + String name = described.getName(); + + removePage(name, page.getName()); + } + + private void removePage(String name, String internalName) + { + PageInfo pageInfo = pageInfos.get(name); + if (pageInfo != null && internalName.equals(pageInfo.getInternalName())) + { + // remove page info + pageInfos.remove(name); + } + } + + private static class PageInfo + { + private final String uuid; + private final Map<String, String> childrenWindows = new HashMap<String, String>(); + + /** Name as provided by Described */ + private final String name; + + /** Name as automatically generated */ + private final String internalName; + + private PageInfo(String uuid, String name, String internalName) + { + this.uuid = uuid; + this.name = name; + this.internalName = internalName; + } + + public String getUUID() + { + return uuid; + } + + public String getInternalName() + { + return internalName; + } + + public List<String> getChildrenWindows() + { + return new ArrayList<String>(childrenWindows.keySet()); + } + + public void addWindow(String windowName, String uuid) + { + // add suffix in case we have several windows with the same name in the page + if (childrenWindows.containsKey(windowName)) + { + if (windowName.endsWith("|")) + { + windowName += "|"; + } + else + { + windowName += windowName + " |"; + } + } + + childrenWindows.put(windowName, uuid); + } + + public void updateWindowName(String oldWindowName, String newWindowName) + { + String windowUUID = getWindowUUID(oldWindowName); + childrenWindows.remove(oldWindowName); + childrenWindows.put(newWindowName, windowUUID); + } + + public String getName() + { + return name; + } + + public String getWindowUUID(String windowId) + { + return childrenWindows.get(windowId); + } + } +} Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,111 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2011, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * 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. - */ - -package org.gatein.integration.wsrp.structure; - -import org.exoplatform.portal.pom.config.POMSession; -import org.exoplatform.portal.pom.config.POMSessionManager; -import org.exoplatform.portal.pom.data.Mapper; -import org.exoplatform.portal.pom.data.PageKey; -import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.Page; -import org.gatein.mop.api.workspace.Site; -import org.gatein.mop.api.workspace.Workspace; -import org.gatein.mop.api.workspace.ui.UIWindow; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public class MOPPortalStructureAccess implements PortalStructureAccess -{ - private static final String PAGES_CHILD_NAME = "pages"; - private final POMSessionManager pomManager; - - public MOPPortalStructureAccess(POMSessionManager pomManager) - { - this.pomManager = pomManager; - } - - public Collection<Page> getPages() - { - POMSession session = pomManager.getSession(); - Workspace workspace = session.getWorkspace(); - Collection<Site> sites = workspace.getSites(ObjectType.PORTAL_SITE); - - List<Page> pages = new ArrayList<Page>(sites.size() * 10); - - for (Site site : sites) - { - Page pagesRoot = getPagesFrom(site); - if (pagesRoot != null) - { - Collection<Page> children = pagesRoot.getChildren(); - for (Page child : children) - { - pages.add(child); - } - } - } - - return pages; - } - - public UIWindow getWindowFrom(String uuid) - { - POMSession session = pomManager.getSession(); - return session.findObjectById(ObjectType.WINDOW, uuid); - } - - public void saveChangesTo(UIWindow window) - { - POMSession session = pomManager.getSession(); - - // mark page for cache invalidation otherwise DataCache will use the previous customization id when trying to set - // the portlet state in UIPortlet.setState and will not find it resulting in an error - Page page = window.getPage(); - session.scheduleForEviction(new PageKey("portal", page.getSite().getName(), page.getName())); - - // save - session.close(true); - } - - public Page getPageFrom(org.exoplatform.portal.config.model.Page portalPage) - { - POMSession session = pomManager.getSession(); - Site site = session.getWorkspace().getSite(Mapper.parseSiteType(portalPage.getOwnerType()), portalPage.getOwnerId()); - return getPagesFrom(site).getChild(portalPage.getName()); - } - - private Page getPagesFrom(Site site) - { - // a site contains a root page with templates and pages - // more info at http://code.google.com/p/chromattic/wiki/MOPUseCases - - return site.getRootPage().getChild(PAGES_CHILD_NAME); - } -} Copied: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,111 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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. + */ + +package org.gatein.integration.wsrp.structure; + +import org.exoplatform.portal.pom.config.POMSession; +import org.exoplatform.portal.pom.config.POMSessionManager; +import org.exoplatform.portal.pom.data.Mapper; +import org.exoplatform.portal.pom.data.PageKey; +import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.workspace.Page; +import org.gatein.mop.api.workspace.Site; +import org.gatein.mop.api.workspace.Workspace; +import org.gatein.mop.api.workspace.ui.UIWindow; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class MOPPortalStructureAccess implements PortalStructureAccess +{ + private static final String PAGES_CHILD_NAME = "pages"; + private final POMSessionManager pomManager; + + public MOPPortalStructureAccess(POMSessionManager pomManager) + { + this.pomManager = pomManager; + } + + public Collection<Page> getPages() + { + POMSession session = pomManager.getSession(); + Workspace workspace = session.getWorkspace(); + Collection<Site> sites = workspace.getSites(ObjectType.PORTAL_SITE); + + List<Page> pages = new ArrayList<Page>(sites.size() * 10); + + for (Site site : sites) + { + Page pagesRoot = getPagesFrom(site); + if (pagesRoot != null) + { + Collection<Page> children = pagesRoot.getChildren(); + for (Page child : children) + { + pages.add(child); + } + } + } + + return pages; + } + + public UIWindow getWindowFrom(String uuid) + { + POMSession session = pomManager.getSession(); + return session.findObjectById(ObjectType.WINDOW, uuid); + } + + public void saveChangesTo(UIWindow window) + { + POMSession session = pomManager.getSession(); + + // mark page for cache invalidation otherwise DataCache will use the previous customization id when trying to set + // the portlet state in UIPortlet.setState and will not find it resulting in an error + Page page = window.getPage(); + session.scheduleForEviction(new PageKey("portal", page.getSite().getName(), page.getName())); + + // save + session.close(true); + } + + public Page getPageFrom(org.exoplatform.portal.config.model.Page portalPage) + { + POMSession session = pomManager.getSession(); + Site site = session.getWorkspace().getSite(Mapper.parseSiteType(portalPage.getOwnerType()), portalPage.getOwnerId()); + return getPagesFrom(site).getChild(portalPage.getName()); + } + + private Page getPagesFrom(Site site) + { + // a site contains a root page with templates and pages + // more info at http://code.google.com/p/chromattic/wiki/MOPUseCases + + return site.getRootPage().getChild(PAGES_CHILD_NAME); + } +} Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,44 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2011, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * 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. - */ - -package org.gatein.integration.wsrp.structure; - -import org.gatein.mop.api.workspace.Page; -import org.gatein.mop.api.workspace.ui.UIWindow; - -import java.util.Collection; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public interface PortalStructureAccess -{ - Collection<Page> getPages(); - - UIWindow getWindowFrom(String uuid); - - void saveChangesTo(UIWindow window); - - Page getPageFrom(org.exoplatform.portal.config.model.Page portalPage); -} Copied: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/PortalStructureAccess.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,44 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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. + */ + +package org.gatein.integration.wsrp.structure; + +import org.gatein.mop.api.workspace.Page; +import org.gatein.mop.api.workspace.ui.UIWindow; + +import java.util.Collection; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public interface PortalStructureAccess +{ + Collection<Page> getPages(); + + UIWindow getWindowFrom(String uuid); + + void saveChangesTo(UIWindow window); + + Page getPageFrom(org.exoplatform.portal.config.model.Page portalPage); +} Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,68 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2011, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * 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. * - ******************************************************************************/ -package org.gatein.portal.wsrp.wss; - -import org.gatein.wsrp.wss.WebServiceSecurityFactory; -import org.picocontainer.Startable; -import org.wsrp.wss.jboss5.handlers.consumer.WSSecurityCredentialHandler; -import org.wsrp.wss.jboss5.handlers.consumer.JBWSSecurityHandlerWrapper; - -/** - * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> - * @version $Revision$ - */ -public class JBoss5WSSServiceIntegration implements Startable -{ - private final WebServiceSecurityFactory wssFactory; - - private final WSSecurityCredentialHandler WS_CREDENTIAL_HANDLER = new WSSecurityCredentialHandler(); - private final JBWSSecurityHandlerWrapper JBWS_SECURITY_WRAPPER = new JBWSSecurityHandlerWrapper(); - - public JBoss5WSSServiceIntegration() - { - wssFactory = WebServiceSecurityFactory.getInstance(); - } - - public void start() - { - startConsumer(); - } - - public void stop() - { - stopConsumer(); - } - - protected void startConsumer() - { - wssFactory.registerWebServiceSecurityHandler(WS_CREDENTIAL_HANDLER); - wssFactory.registerWebServiceSecurityHandler(JBWS_SECURITY_WRAPPER); - } - - protected void stopConsumer() - { - wssFactory.unregisterWebServiceSecurityHandler(WS_CREDENTIAL_HANDLER); - wssFactory.unregisterWebServiceSecurityHandler(JBWS_SECURITY_WRAPPER); - } -} - Copied: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,68 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2011, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * 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. * + ******************************************************************************/ +package org.gatein.integration.wsrp.wss; + +import org.gatein.wsrp.wss.WebServiceSecurityFactory; +import org.picocontainer.Startable; +import org.wsrp.wss.jboss5.handlers.consumer.WSSecurityCredentialHandler; +import org.wsrp.wss.jboss5.handlers.consumer.JBWSSecurityHandlerWrapper; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class JBoss5WSSServiceIntegration implements Startable +{ + private final WebServiceSecurityFactory wssFactory; + + private final WSSecurityCredentialHandler WS_CREDENTIAL_HANDLER = new WSSecurityCredentialHandler(); + private final JBWSSecurityHandlerWrapper JBWS_SECURITY_WRAPPER = new JBWSSecurityHandlerWrapper(); + + public JBoss5WSSServiceIntegration() + { + wssFactory = WebServiceSecurityFactory.getInstance(); + } + + public void start() + { + startConsumer(); + } + + public void stop() + { + stopConsumer(); + } + + protected void startConsumer() + { + wssFactory.registerWebServiceSecurityHandler(WS_CREDENTIAL_HANDLER); + wssFactory.registerWebServiceSecurityHandler(JBWS_SECURITY_WRAPPER); + } + + protected void stopConsumer() + { + wssFactory.unregisterWebServiceSecurityHandler(WS_CREDENTIAL_HANDLER); + wssFactory.unregisterWebServiceSecurityHandler(JBWS_SECURITY_WRAPPER); + } +} + Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/resources ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/main/resources/conf ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,35 +0,0 @@ - - - -<producer-configuration xmlns="urn:jboss:portal:wsrp:producer:v2_7" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_7.xsd"> - <registration-configuration fullServiceDescriptionRequiresRegistration="true"> - <registration-property-validator>org.gatein.registration.policies.DefaultRegistrationPropertyValidator - </registration-property-validator> - </registration-configuration> -</producer-configuration> - -  -  \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,35 @@ + + + +<producer-configuration xmlns="urn:jboss:portal:wsrp:producer:v2_7" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_7 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_7.xsd"> + <registration-configuration fullServiceDescriptionRequiresRegistration="true"> + <registration-property-validator>org.gatein.registration.policies.DefaultRegistrationPropertyValidator + </registration-property-validator> + </registration-configuration> +</producer-configuration> + +  +  \ No newline at end of file Property changes on: portal/trunk/wsrp-integration/extension-component/src/test ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/test/java ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/test/java/org ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,302 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2011, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * 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. - */ - -package org.gatein.integration.wsrp.structure; - -import junit.framework.TestCase; -import org.exoplatform.portal.config.DataStorage; -import org.exoplatform.portal.mop.Described; -import org.exoplatform.portal.pom.spi.wsrp.WSRP; -import org.exoplatform.services.listener.Event; -import org.gatein.mop.api.content.Customization; -import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.Page; -import org.gatein.mop.api.workspace.ui.UIComponent; -import org.gatein.mop.api.workspace.ui.UIContainer; -import org.gatein.mop.api.workspace.ui.UIWindow; -import org.gatein.pc.api.PortletContext; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.*; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public class MOPConsumerStructureProviderTestCase extends TestCase -{ - private MOPConsumerStructureProvider provider; - private PortalStructureAccess structureAccess; - private Page page1; - - public void testGetPageIdentifiers() - { - List<String> pageIdentifiers = provider.getPageIdentifiers(); - assertEquals(5, pageIdentifiers.size()); - assertTrue(pageIdentifiers.contains("page1")); - assertTrue(pageIdentifiers.contains("page11")); - assertTrue(pageIdentifiers.contains("page12")); - assertTrue(pageIdentifiers.contains("page2")); - assertTrue(pageIdentifiers.contains("page21")); - } - - public void testGetWindowIdentifiersForInexistingPage() - { - try - { - provider.getWindowIdentifiersFor("inexisting"); - fail("Cannot retrieve windows for an inexistent page"); - } - catch (IllegalArgumentException e) - { - // expected - } - } - - public void testGetWindowIdentifiersFor() - { - checkWindows("page1", "window11", "window12"); - checkWindows("page2"); - checkWindows("page11", "window111", "window112"); - checkWindows("page12", "window121"); - checkWindows("page21", "window211"); - } - - public void testAssignPortletToWindow() - { - String newCustomizationId = "new"; - String newWindowName = "portlet"; - provider.assignPortletToWindow(PortletContext.createPortletContext(newCustomizationId), "window11", "page1", newWindowName); - verify(structureAccess).getWindowFrom(getIdFor("window11")); - - UIWindow window11 = structureAccess.getWindowFrom(getIdFor("window11")); - verify(structureAccess).saveChangesTo(window11); - - Described described = window11.adapt(Described.class); - verify(described).setName(newWindowName + " (remote)"); - - WSRP state = new WSRP(); - state.setPortletId(newCustomizationId); - verify(window11).customize(WSRP.CONTENT_TYPE, newCustomizationId, state); - - Customization<?> customization = window11.getCustomization(); - assertEquals(WSRP.CONTENT_TYPE, customization.getType()); - } - - public void testPageCreationEvent() throws Exception - { - Page foo = createPage("foo", new String[]{"foo1"}, new String[]{"windowfoo1"}); - Page foo1 = foo.getChild("foo1"); - addWindows(foo1, "windowfoo11"); - org.exoplatform.portal.config.model.Page portalPage = mock(org.exoplatform.portal.config.model.Page.class); - when(structureAccess.getPageFrom(portalPage)).thenReturn(foo); - - int pageNumber = provider.getPageIdentifiers().size(); - - provider.onEvent(new Event<DataStorage, org.exoplatform.portal.config.model.Page>(DataStorage.PAGE_CREATED, null, portalPage)); - - List<String> identifiers = provider.getPageIdentifiers(); - assertEquals(pageNumber + 2, identifiers.size()); - assertTrue(identifiers.contains("foo")); - assertTrue(identifiers.contains("foo1")); - - checkWindows("foo", "windowfoo1"); - checkWindows("foo1", "windowfoo11"); - - assertEquals(foo1.getRootComponent().get("windowfoo11"), structureAccess.getWindowFrom(getIdFor("windowfoo11"))); - } - - public void testPageDeletionEvent() throws Exception - { - String pageToRemove = "page1"; - - org.exoplatform.portal.config.model.Page portalPage = mock(org.exoplatform.portal.config.model.Page.class); - when(portalPage.getName()).thenReturn(createInternalNameFrom(pageToRemove)); - when(portalPage.getTitle()).thenReturn(pageToRemove); - - // on delete, we actually get the event after the page has been removed from JCR so we don't have an actual page - when(structureAccess.getPageFrom(portalPage)).thenReturn(null); - - int pageNumber = provider.getPageIdentifiers().size(); - - provider.onEvent(new Event<DataStorage, org.exoplatform.portal.config.model.Page>(DataStorage.PAGE_REMOVED, null, portalPage)); - - List<String> identifiers = provider.getPageIdentifiers(); - assertEquals(pageNumber - 1, identifiers.size()); - // deleting a page doesn't delete its children, see GTNPORTAL-1630 - assertFalse(identifiers.contains(pageToRemove)); - assertTrue(identifiers.contains("page11")); - assertTrue(identifiers.contains("page12")); - } - - public void testPageUpdatedEvent() throws Exception - { - // todo! - } - - @Override - protected void setUp() throws Exception - { - structureAccess = mock(PortalStructureAccess.class); - - page1 = createPage("page1", new String[]{"page11", "page12"}, new String[]{"window11", "window12"}); - Page page2 = createPage("page2", new String[]{"page21"}, null); - - Page page11 = page1.getChild("page11"); - addWindows(page11, "window111", "window112"); - - Page page12 = page1.getChild("page12"); - addWindows(page12, "window121"); - - Page page21 = page2.getChild("page21"); - addWindows(page21, "window211"); - - ArrayList<Page> pages = new ArrayList<Page>(); - pages.add(page1); - pages.add(page11); - pages.add(page12); - pages.add(page2); - pages.add(page21); - when(structureAccess.getPages()).thenReturn(pages); - - provider = new MOPConsumerStructureProvider(structureAccess); - - // needed to initialize state - provider.getPageIdentifiers(); - } - - private void checkWindows(final String pageName, String... windowNames) - { - List<String> windows = provider.getWindowIdentifiersFor(pageName); - - if (windowNames != null) - { - assertEquals(windowNames.length, windows.size()); - for (String windowName : windowNames) - { - assertTrue(windows.contains(windowName)); - } - } - } - - private Page createPage(String name, String[] childrenPages, String[] windowNames) - { - Page page = mock(Page.class); - - when(page.getName()).thenReturn(createInternalNameFrom(name)); - - // mock call to adapt - Described described = mock(Described.class); - when(described.getName()).thenReturn(name); - - when(page.adapt(Described.class)).thenReturn(described); - - if (childrenPages != null) - { - List<Page> children = new ArrayList<Page>(childrenPages.length); - for (String pageId : childrenPages) - { - Page childPage = createPage(pageId, null, null); - when(page.getChild(pageId)).thenReturn(childPage); - children.add(childPage); - } - - when(page.getChildren()).thenReturn(children); - } - - addWindows(page, windowNames); - - return page; - } - - private String createInternalNameFrom(String name) - { - return name + "internal"; - } - - private void addWindows(Page page, String... windowNames) - { - if (windowNames != null) - { - // mock page container - UIContainer root = mock(UIContainer.class); - when(page.getRootComponent()).thenReturn(root); - - // for each provided window name, create a mock UIWindow... - List<UIComponent> children = new ArrayList<UIComponent>(windowNames.length); - for (String windowName : windowNames) - { - UIWindow window = mock(UIWindow.class); - when(window.getName()).thenThrow(new RuntimeException("Window.getName returns the internal name, not the human readable one")); - when(window.getObjectId()).thenReturn(getIdFor(windowName)); - - // need to use thenAnswer instead of thenReturn here because it doesn't play well with generics - when(window.getObjectType()).thenAnswer(new Answer<Object>() - { - public Object answer(InvocationOnMock invocationOnMock) throws Throwable - { - return ObjectType.WINDOW; - } - }); - - // mock call to adapt - Described described = mock(Described.class); - when(described.getName()).thenReturn(windowName); - - when(window.adapt(Described.class)).thenReturn(described); - - // mock Customization - final Customization<WSRP> customization = mock(Customization.class); - when(customization.getType()).thenReturn(WSRP.CONTENT_TYPE); - when(window.getCustomization()).thenAnswer(new Answer<Object>() - { - public Object answer(InvocationOnMock invocationOnMock) throws Throwable - { - return customization; - } - }); - - // add it to the list of windows for this page - children.add(window); - - // make sure that we return the window when we ask for it from its uuid - when(structureAccess.getWindowFrom(getIdFor(windowName))).thenReturn(window); - - // make sure that we return the window if we ask the root component for it - when(root.get(windowName)).thenReturn(window); - } - - // the container should return the list of windows when asked for its components - when(root.getComponents()).thenReturn(children); - } - } - - private String getIdFor(String windowName) - { - return windowName + "Id"; - } -} Copied: portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java) =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java (rev 0) +++ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,302 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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. + */ + +package org.gatein.integration.wsrp.structure; + +import junit.framework.TestCase; +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.mop.Described; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; +import org.exoplatform.services.listener.Event; +import org.gatein.mop.api.content.Customization; +import org.gatein.mop.api.workspace.ObjectType; +import org.gatein.mop.api.workspace.Page; +import org.gatein.mop.api.workspace.ui.UIComponent; +import org.gatein.mop.api.workspace.ui.UIContainer; +import org.gatein.mop.api.workspace.ui.UIWindow; +import org.gatein.pc.api.PortletContext; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.*; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class MOPConsumerStructureProviderTestCase extends TestCase +{ + private MOPConsumerStructureProvider provider; + private PortalStructureAccess structureAccess; + private Page page1; + + public void testGetPageIdentifiers() + { + List<String> pageIdentifiers = provider.getPageIdentifiers(); + assertEquals(5, pageIdentifiers.size()); + assertTrue(pageIdentifiers.contains("page1")); + assertTrue(pageIdentifiers.contains("page11")); + assertTrue(pageIdentifiers.contains("page12")); + assertTrue(pageIdentifiers.contains("page2")); + assertTrue(pageIdentifiers.contains("page21")); + } + + public void testGetWindowIdentifiersForInexistingPage() + { + try + { + provider.getWindowIdentifiersFor("inexisting"); + fail("Cannot retrieve windows for an inexistent page"); + } + catch (IllegalArgumentException e) + { + // expected + } + } + + public void testGetWindowIdentifiersFor() + { + checkWindows("page1", "window11", "window12"); + checkWindows("page2"); + checkWindows("page11", "window111", "window112"); + checkWindows("page12", "window121"); + checkWindows("page21", "window211"); + } + + public void testAssignPortletToWindow() + { + String newCustomizationId = "new"; + String newWindowName = "portlet"; + provider.assignPortletToWindow(PortletContext.createPortletContext(newCustomizationId), "window11", "page1", newWindowName); + verify(structureAccess).getWindowFrom(getIdFor("window11")); + + UIWindow window11 = structureAccess.getWindowFrom(getIdFor("window11")); + verify(structureAccess).saveChangesTo(window11); + + Described described = window11.adapt(Described.class); + verify(described).setName(newWindowName + " (remote)"); + + WSRP state = new WSRP(); + state.setPortletId(newCustomizationId); + verify(window11).customize(WSRP.CONTENT_TYPE, newCustomizationId, state); + + Customization<?> customization = window11.getCustomization(); + assertEquals(WSRP.CONTENT_TYPE, customization.getType()); + } + + public void testPageCreationEvent() throws Exception + { + Page foo = createPage("foo", new String[]{"foo1"}, new String[]{"windowfoo1"}); + Page foo1 = foo.getChild("foo1"); + addWindows(foo1, "windowfoo11"); + org.exoplatform.portal.config.model.Page portalPage = mock(org.exoplatform.portal.config.model.Page.class); + when(structureAccess.getPageFrom(portalPage)).thenReturn(foo); + + int pageNumber = provider.getPageIdentifiers().size(); + + provider.onEvent(new Event<DataStorage, org.exoplatform.portal.config.model.Page>(DataStorage.PAGE_CREATED, null, portalPage)); + + List<String> identifiers = provider.getPageIdentifiers(); + assertEquals(pageNumber + 2, identifiers.size()); + assertTrue(identifiers.contains("foo")); + assertTrue(identifiers.contains("foo1")); + + checkWindows("foo", "windowfoo1"); + checkWindows("foo1", "windowfoo11"); + + assertEquals(foo1.getRootComponent().get("windowfoo11"), structureAccess.getWindowFrom(getIdFor("windowfoo11"))); + } + + public void testPageDeletionEvent() throws Exception + { + String pageToRemove = "page1"; + + org.exoplatform.portal.config.model.Page portalPage = mock(org.exoplatform.portal.config.model.Page.class); + when(portalPage.getName()).thenReturn(createInternalNameFrom(pageToRemove)); + when(portalPage.getTitle()).thenReturn(pageToRemove); + + // on delete, we actually get the event after the page has been removed from JCR so we don't have an actual page + when(structureAccess.getPageFrom(portalPage)).thenReturn(null); + + int pageNumber = provider.getPageIdentifiers().size(); + + provider.onEvent(new Event<DataStorage, org.exoplatform.portal.config.model.Page>(DataStorage.PAGE_REMOVED, null, portalPage)); + + List<String> identifiers = provider.getPageIdentifiers(); + assertEquals(pageNumber - 1, identifiers.size()); + // deleting a page doesn't delete its children, see GTNPORTAL-1630 + assertFalse(identifiers.contains(pageToRemove)); + assertTrue(identifiers.contains("page11")); + assertTrue(identifiers.contains("page12")); + } + + public void testPageUpdatedEvent() throws Exception + { + // todo! + } + + @Override + protected void setUp() throws Exception + { + structureAccess = mock(PortalStructureAccess.class); + + page1 = createPage("page1", new String[]{"page11", "page12"}, new String[]{"window11", "window12"}); + Page page2 = createPage("page2", new String[]{"page21"}, null); + + Page page11 = page1.getChild("page11"); + addWindows(page11, "window111", "window112"); + + Page page12 = page1.getChild("page12"); + addWindows(page12, "window121"); + + Page page21 = page2.getChild("page21"); + addWindows(page21, "window211"); + + ArrayList<Page> pages = new ArrayList<Page>(); + pages.add(page1); + pages.add(page11); + pages.add(page12); + pages.add(page2); + pages.add(page21); + when(structureAccess.getPages()).thenReturn(pages); + + provider = new MOPConsumerStructureProvider(structureAccess); + + // needed to initialize state + provider.getPageIdentifiers(); + } + + private void checkWindows(final String pageName, String... windowNames) + { + List<String> windows = provider.getWindowIdentifiersFor(pageName); + + if (windowNames != null) + { + assertEquals(windowNames.length, windows.size()); + for (String windowName : windowNames) + { + assertTrue(windows.contains(windowName)); + } + } + } + + private Page createPage(String name, String[] childrenPages, String[] windowNames) + { + Page page = mock(Page.class); + + when(page.getName()).thenReturn(createInternalNameFrom(name)); + + // mock call to adapt + Described described = mock(Described.class); + when(described.getName()).thenReturn(name); + + when(page.adapt(Described.class)).thenReturn(described); + + if (childrenPages != null) + { + List<Page> children = new ArrayList<Page>(childrenPages.length); + for (String pageId : childrenPages) + { + Page childPage = createPage(pageId, null, null); + when(page.getChild(pageId)).thenReturn(childPage); + children.add(childPage); + } + + when(page.getChildren()).thenReturn(children); + } + + addWindows(page, windowNames); + + return page; + } + + private String createInternalNameFrom(String name) + { + return name + "internal"; + } + + private void addWindows(Page page, String... windowNames) + { + if (windowNames != null) + { + // mock page container + UIContainer root = mock(UIContainer.class); + when(page.getRootComponent()).thenReturn(root); + + // for each provided window name, create a mock UIWindow... + List<UIComponent> children = new ArrayList<UIComponent>(windowNames.length); + for (String windowName : windowNames) + { + UIWindow window = mock(UIWindow.class); + when(window.getName()).thenThrow(new RuntimeException("Window.getName returns the internal name, not the human readable one")); + when(window.getObjectId()).thenReturn(getIdFor(windowName)); + + // need to use thenAnswer instead of thenReturn here because it doesn't play well with generics + when(window.getObjectType()).thenAnswer(new Answer<Object>() + { + public Object answer(InvocationOnMock invocationOnMock) throws Throwable + { + return ObjectType.WINDOW; + } + }); + + // mock call to adapt + Described described = mock(Described.class); + when(described.getName()).thenReturn(windowName); + + when(window.adapt(Described.class)).thenReturn(described); + + // mock Customization + final Customization<WSRP> customization = mock(Customization.class); + when(customization.getType()).thenReturn(WSRP.CONTENT_TYPE); + when(window.getCustomization()).thenAnswer(new Answer<Object>() + { + public Object answer(InvocationOnMock invocationOnMock) throws Throwable + { + return customization; + } + }); + + // add it to the list of windows for this page + children.add(window); + + // make sure that we return the window when we ask for it from its uuid + when(structureAccess.getWindowFrom(getIdFor(windowName))).thenReturn(window); + + // make sure that we return the window if we ask the root component for it + when(root.get(windowName)).thenReturn(window); + } + + // the container should return the list of windows when asked for its components + when(root.getComponents()).thenReturn(children); + } + } + + private String getIdFor(String windowName) + { + return windowName + "Id"; + } +} Property changes on: portal/trunk/wsrp-integration/extension-config ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-config/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-config/pom.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-config/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,41 +0,0 @@ - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>1.0.0-Beta01-SNAPSHOT</version> - </parent> - - <artifactId>extension-config</artifactId> - <name>GateIn WSRP Integration extension config</name> - - - <build> - <finalName>extension-config</finalName> - </build> - -</project> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-config/pom.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-config/pom.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-config/pom.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-config/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,41 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>1.0.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>extension-config</artifactId> + <name>GateIn WSRP Integration extension config</name> + + + <build> + <finalName>extension-config</finalName> + </build> + +</project> \ No newline at end of file Property changes on: portal/trunk/wsrp-integration/extension-config/src ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-config/src/main ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-config/src/main/resources ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-config/src/main/resources/conf ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - <external-component-plugins> -  - <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> - <component-plugin> -  - <name>Change PortalContainer Definitions</name> -  - <set-method>registerChangePlugin</set-method> -  - <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type> - <init-params> - <value-param> - <name>apply.default</name> - <value>true</value> - </value-param> - <object-param> - <name>change</name> - <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies"> -  - <field name="dependencies"> - <collection type="java.util.ArrayList"> - <value profiles="jboss"> - <string>gatein-wsrp-integration</string> - </value> - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - </external-component-plugins> -</configuration> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + <external-component-plugins> +  + <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> + <component-plugin> +  + <name>Change PortalContainer Definitions</name> +  + <set-method>registerChangePlugin</set-method> +  + <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type> + <init-params> + <value-param> + <name>apply.default</name> + <value>true</value> + </value-param> + <object-param> + <name>change</name> + <object type="org.exoplatform.container.definition.PortalContainerDefinitionChange$AddDependencies"> +  + <field name="dependencies"> + <collection type="java.util.ArrayList"> + <value profiles="jboss"> + <string>gatein-wsrp-integration</string> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> \ No newline at end of file Property changes on: portal/trunk/wsrp-integration/extension-ear ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-ear/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-ear/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,193 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>1.0.0-Beta01-SNAPSHOT</version> - </parent> - - <artifactId>extension-ear</artifactId> - <packaging>ear</packaging> - - <name>GateIn WSRP Integration extension EAR</name> - - <dependencies> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-config</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-war</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-component</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <version>${org.gatein.wsrp.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - <version>${org.gatein.wsrp.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <displayName>gatein-wsrp-integration</displayName> - <defaultLibBundleDir>lib</defaultLibBundleDir> - <modules> - <webModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-war</artifactId> - <contextRoot>gatein-wsrp-integration</contextRoot> - </webModule> - <webModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - <contextRoot>wsrp-producer</contextRoot> - </webModule> - <webModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <contextRoot>wsrp-admin-gui</contextRoot> - </webModule> - <jarModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-config</artifactId> - <includeInApplicationXml>true</includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-component</artifactId> - <includeInApplicationXml>true</includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - </jarModule> - </modules> - </configuration> - </plugin> - </plugins> - <finalName>gatein-wsrp-integration</finalName> - </build> - -</project> Copied: portal/trunk/wsrp-integration/extension-ear/pom.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-ear/pom.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-ear/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,193 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>1.0.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>extension-ear</artifactId> + <packaging>ear</packaging> + + <name>GateIn WSRP Integration extension EAR</name> + + <dependencies> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>gatein-wsrp-integration</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <modules> + <webModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <contextRoot>gatein-wsrp-integration</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <contextRoot>wsrp-producer</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + </webModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </jarModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Property changes on: portal/trunk/wsrp-integration/extension-ear/src ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-ear/src/main ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-ear/src/main/application ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,8 +0,0 @@ - <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config - http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - -  - -</jboss-ws-security> Copied: portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,8 @@ + <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config + http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + +  + +</jboss-ws-security> Deleted: portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,25 +0,0 @@ - - -<scanning xmlns="urn:jboss:scanning:1.0"> -</scanning> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,25 @@ + + +<scanning xmlns="urn:jboss:scanning:1.0"> +</scanning> \ No newline at end of file Property changes on: portal/trunk/wsrp-integration/extension-war ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-war/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/pom.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>1.0.0-Beta01-SNAPSHOT</version> - </parent> - - <artifactId>extension-war</artifactId> - <packaging>war</packaging> - - <name>GateIn WSRP Integration extension WAR</name> - - <build> - <finalName>gatein-wsrp-integration</finalName> - </build> - -</project> Copied: portal/trunk/wsrp-integration/extension-war/pom.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/pom.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/pom.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>1.0.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>extension-war</artifactId> + <packaging>war</packaging> + + <name>GateIn WSRP Integration extension WAR</name> + + <build> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Property changes on: portal/trunk/wsrp-integration/extension-war/src ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-war/src/main ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-war/src/main/webapp ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> - <import profiles="jboss">war:/conf/wsrp/jcr-configuration.xml</import> -</configuration> Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> + <import profiles="jboss">war:/conf/wsrp/jcr-configuration.xml</import> +</configuration> Property changes on: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" - xmlns:jcr="http://www.jcp.org/jcr/1.0"> - - <nodeType name="wsrp:producerinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:producerinfo" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:producerinfo</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:producerinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="producerid" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="cache" requiredType="Integer" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="active" requiredType="boolean" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="endpoint" defaultPrimaryType="wsrp:endpointinfo" autoCreated="true" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:endpointinfo</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="registration" defaultPrimaryType="wsrp:registrationinfo" autoCreated="true" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:registrationinfo</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:endpointinfo" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="wsdlurl" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="timeout" requiredType="Integer" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="enablewss" requiredType="boolean" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="wsrp:registrationinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="consumername" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationproperty" autoCreated="false" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:registrationproperty</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="status" requiredType="Integer" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true" - primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - -</nodeTypes> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="wsrp:producerinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:producerinfo" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:producerinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:producerinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="producerid" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="cache" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="active" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="endpoint" defaultPrimaryType="wsrp:endpointinfo" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:endpointinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="registration" defaultPrimaryType="wsrp:registrationinfo" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:endpointinfo" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="wsdlurl" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="timeout" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="enablewss" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="consumername" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationproperty" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationproperty</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true" + primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - - <external-component-plugins> -  - <target-component>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</target-component> - <component-plugin> -  - <name>Sample RepositoryServiceConfiguration Plugin</name> -  - <set-method>addConfig</set-method> -  - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationPlugin</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>war:/conf/wsrp/repository-configuration.xml</value> - </value-param> - </init-params> - </component-plugin> - </external-component-plugins> -</configuration> Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/jcr-configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <external-component-plugins> +  + <target-component>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</target-component> + <component-plugin> +  + <name>Sample RepositoryServiceConfiguration Plugin</name> +  + <set-method>addConfig</set-method> +  + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationPlugin</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>war:/conf/wsrp/repository-configuration.xml</value> + </value-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" - xmlns:jcr="http://www.jcp.org/jcr/1.0"> - - <nodeType name="wsrp:exportinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportinfo" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:exportinfo</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:exportinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="exporttime" requiredType="Long" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="expirationtime" requiredType="Long" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="exportcontext" requiredType="Binary" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportedstate" autoCreated="false" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:exportedstate</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:exporterror" autoCreated="false" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:exporterror</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:exportedstate" isMixin="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="wsrp:exporterror" isMixin="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="errorcode" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="handles" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - </nodeType> -</nodeTypes> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="wsrp:exportinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportinfo" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exportinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:exportinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="exporttime" requiredType="Long" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="expirationtime" requiredType="Long" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="exportcontext" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportedstate" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exportedstate</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exporterror" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exporterror</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:exportedstate" isMixin="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:exporterror" isMixin="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="errorcode" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="handles" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> +</nodeTypes> \ No newline at end of file Property changes on: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform ___________________________________________________________________ Added: svn:ignore + *.iml .idea Property changes on: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators ___________________________________________________________________ Added: svn:ignore + *.iml .idea Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<node-navigation - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> - <priority>2</priority> - - <page-nodes> -  -  - <node> -  - <uri>wsrpConfiguration</uri> - <name>wsrpConfiguration</name> -  - <label>WSRP</label> - <page-reference>group::/platform/administrators::wsrpConfiguration</page-reference> - </node> -  - </page-nodes> -</node-navigation> Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/navigation.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<node-navigation + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + <priority>2</priority> + + <page-nodes> +  +  + <node> +  + <uri>wsrpConfiguration</uri> + <name>wsrpConfiguration</name> +  + <label>WSRP</label> + <page-reference>group::/platform/administrators::wsrpConfiguration</page-reference> + </node> +  + </page-nodes> +</node-navigation> Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<page-set - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> - - <page> - <name>wsrpConfiguration</name> - <title>WSRP Admin</title> - <access-permissions>manager:/platform/administrators</access-permissions> - <edit-permission>manager:/platform/administrators</edit-permission> - <portlet-application> - <portlet> - <application-ref>wsrp-admin-gui</application-ref> - <portlet-ref>WSRPConfigurationPortlet</portlet-ref> - </portlet> - <title>WSRP Admin</title> - <access-permissions>manager:/platform/administrators</access-permissions> - <show-info-bar>false</show-info-bar> - </portlet-application> - </page> - -</page-set> Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_1 http://www.gatein.org/xml/ns/gatein_objects_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"> + + <page> + <name>wsrpConfiguration</name> + <title>WSRP Admin</title> + <access-permissions>manager:/platform/administrators</access-permissions> + <edit-permission>manager:/platform/administrators</edit-permission> + <portlet-application> + <portlet> + <application-ref>wsrp-admin-gui</application-ref> + <portlet-ref>WSRPConfigurationPortlet</portlet-ref> + </portlet> + <title>WSRP Admin</title> + <access-permissions>manager:/platform/administrators</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + </page> + +</page-set> Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" - xmlns:jcr="http://www.jcp.org/jcr/1.0"> - - <nodeType name="wsrp:producerconfiguration" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="strictmode" requiredType="boolean" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="registrationrequirements" defaultPrimaryType="wsrp:registrationrequirements" - autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" - sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:registrationrequirements</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:registrationrequirements" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="registrationrequired" requiredType="boolean" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="registrationrequiredforfulldescription" requiredType="boolean" autoCreated="false" - mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="policyclassname" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="validatorclassname" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationpropertydescription" autoCreated="false" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="status" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true" - primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - -</nodeTypes> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="wsrp:producerconfiguration" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="strictmode" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="registrationrequirements" defaultPrimaryType="wsrp:registrationrequirements" + autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationrequirements</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationrequirements" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="registrationrequired" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="registrationrequiredforfulldescription" requiredType="boolean" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="policyclassname" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="validatorclassname" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationpropertydescription" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true" + primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" - xmlns:jcr="http://www.jcp.org/jcr/1.0"> - <nodeType name="pc:producerstates" isMixin="false" hasOrderableChildNodes="false"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions/> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>pc:statecontext</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="pc:statecontext" isMixin="false" hasOrderableChildNodes="false"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="id" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="state" defaultPrimaryType="pc:state" autoCreated="true" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>pc:state</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="pc:state" isMixin="false" hasOrderableChildNodes="false"> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="pc:portletid" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="pc:terminationtime" requiredType="Date" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions/> - </nodeType> - -</nodeTypes> Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + <nodeType name="pc:producerstates" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions/> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>pc:statecontext</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="pc:statecontext" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="id" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="state" defaultPrimaryType="pc:state" autoCreated="true" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>pc:state</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="pc:state" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="pc:portletid" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="pc:terminationtime" requiredType="Date" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions/> + </nodeType> + +</nodeTypes> Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,198 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" - xmlns:jcr="http://www.jcp.org/jcr/1.0"> - - <nodeType name="wsrp:consumersandgroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumer" - autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:consumer</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumergroup" - autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" - sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:consumergroup</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:consumer" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="id" requiredType="String" autoCreated="false" - mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="consumeragent" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="status" requiredType="String" - autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="group" requiredType="Path" autoCreated="false" mandatory="false" - onParentVersion="COPY" - protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:registration" autoCreated="false" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:registration</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - <childNodeDefinition name="capabilities" defaultPrimaryType="wsrp:consumercapabilities" autoCreated="true" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:consumercapabilities</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:registration" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="status" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="registrationhandle" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="portlethandles" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="true"> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="properties" defaultPrimaryType="wsrp:registrationproperties" autoCreated="false" - mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:registrationproperties</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:registrationproperties" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> -  - <propertyDefinitions> - <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - - <nodeType name="wsrp:consumergroup" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="status" requiredType="String" - autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumer" autoCreated="false" - mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>wsrp:consumer</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - - <nodeType name="wsrp:consumercapabilities" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <propertyDefinitions> - <propertyDefinition name="modes" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="true"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="windowstates" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="true"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="userscopes" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="true"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="userprofiledata" requiredType="String" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="true"> - <valueConstraints/> - </propertyDefinition> - <propertyDefinition name="supportsgetmethod" requiredType="boolean" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" multiple="false"> - <valueConstraints/> - </propertyDefinition> - </propertyDefinitions> - </nodeType> - -</nodeTypes> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" + xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="wsrp:consumersandgroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumer" + autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumer</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumergroup" + autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumergroup</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:consumer" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="id" requiredType="String" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="consumeragent" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" + autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="group" requiredType="Path" autoCreated="false" mandatory="false" + onParentVersion="COPY" + protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registration" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registration</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="capabilities" defaultPrimaryType="wsrp:consumercapabilities" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumercapabilities</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registration" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="status" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="registrationhandle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="portlethandles" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="properties" defaultPrimaryType="wsrp:registrationproperties" autoCreated="false" + mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationproperties</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperties" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> +  + <propertyDefinitions> + <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:consumergroup" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" + autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumer" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumer</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:consumercapabilities" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="modes" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="windowstates" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="userscopes" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="userprofiledata" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="supportsgetmethod" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,176 +0,0 @@ - - -<repository-service default-repository="repository"> - <repositories> - <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>gatein-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> -  - <workspace name="wsrp-system"> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="wsrp-system" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" - value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" - value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/> - <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> - <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system"/> - <property name="max-volatile-time" value="60"/> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m"/> - <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system"/> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system"/> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> - <property name="jbosscache-cl-cache.jdbc.datasource" - value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - </properties> - </lock-manager> - </workspace> - -  - <workspace name="pc-system"> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/pc${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="pc-system" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/pc${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" - value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="${gatein.jcr.index.data.dir}/pc-system${container.name.suffix}"/> - <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> - <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/> - <property name="max-volatile-time" value="60"/> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m"/> - <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-pc-system"/> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> - <property name="jbosscache-cl-cache.jdbc.datasource" - value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - </properties> - </lock-manager> - </workspace> - </workspaces> - </repository> - </repositories> -</repository-service> Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,176 @@ + + +<repository-service default-repository="repository"> + <repositories> + <repository name="repository" system-workspace="system" default-workspace="portal-system"> + <security-domain>gatein-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> +  + <workspace name="wsrp-system"> + <container + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="wsrp-system" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" + value="${gatein.jcr.index.data.dir}/wsrp-system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system"/> + <property name="max-volatile-time" value="60"/> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m"/> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system"/> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system"/> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> + <property name="jbosscache-cl-cache.jdbc.datasource" + value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + </properties> + </lock-manager> + </workspace> + +  + <workspace name="pc-system"> + <container + class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/pc${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="pc-system" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/pc${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" + value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/pc-system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/> + <property name="max-volatile-time" value="60"/> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m"/> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> + <property name="jgroups-multiplexer-stack" value="true"/> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-pc-system"/> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> + <property name="jbosscache-cl-cache.jdbc.datasource" + value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + </properties> + </lock-manager> + </workspace> + </workspaces> + </repository> + </repositories> +</repository-service> Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,229 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - - <component> - <key>org.gatein.integration.wsrp.WSRPServiceIntegration</key> - <type>org.gatein.integration.wsrp.WSRPServiceIntegration</type> - <init-params> - <value-param> - <name>producerConfigLocation</name> - <description>Location of the default producer configuration file</description> - <value>conf/wsrp-producer-config.xml</value> - </value-param> - <value-param> - <name>consumersConfigLocation</name> - <description>Location of the default consumers configuration file</description> - <value>conf/wsrp-consumers-config.xml</value> - </value-param> - </init-params> - </component> - -  - <component> - <type>org.gatein.portal.wsrp.wss.JBoss5WSSServiceIntegration</type> - </component> - - - <external-component-plugins> - <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/> - <property name="pc" value="http://www.gatein.org/jcr/pc/1.0/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value> - <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value> - <value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value> - <value>war:/conf/wsrp/producer-pc-nodetypes.xml</value> - <value>war:/conf/wsrp/migration-nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> - <target-component>org.exoplatform.application.registry.ApplicationRegistryService</target-component> - <component-plugin> - <name>new.portal.portlets.registry</name> - <set-method>initListener</set-method> - <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type> - <description>this listener init the portlets are registered in PortletRegister</description> - <init-params> - <object-param> - <name>administration</name> - <description>description</description> - <object type="org.exoplatform.application.registry.ApplicationCategory"> - <field name="name"> - <string>WSRP</string> - </field> - <field name="displayName"> - <string>WSRP</string> - </field> - <field name="description"> - <string>WSRP administration</string> - </field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value> - <string>*:/platform/administrators</string> - </value> - <value> - <string>*:/organization/management/executive-board</string> - </value> - </collection> - </field> - <field name="applications"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.application.registry.Application"> - <field name="applicationName"> - <string>WSRPConfigurationPortlet</string> - </field> - <field name="categoryName"> - <string>WSRP</string> - </field> - <field name="displayName"> - <string>WSRP Configuration</string> - </field> - <field name="description"> - <string>WSRP Configuration</string> - </field> - <field name="type"> - <string>portlet</string> - </field> - <field name="contentId"> - <string>wsrp-admin-gui/WSRPConfigurationPortlet</string> - </field> - <field name="accessPermissions"> - <collection type="java.util.ArrayList" item-type="java.lang.String"> - <value> - <string>*:/platform/administrators</string> - </value> - <value> - <string>*:/organization/management/executive-board</string> - </value> - </collection> - </field> - </object> - </value> - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> - <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> - <component-plugin> -  - <name>new.portal.config.user.listener</name> -  - <set-method>initListener</set-method> -  - <type>org.exoplatform.portal.config.NewPortalConfigListener</type> - <description>this listener init the portal configuration</description> - <init-params> - <object-param> - <name>group.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>platform/administrators</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>group</string> - </field> - <field name="templateLocation"> - <string>war:/conf/wsrp/portal</string> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - </external-component-plugins> - - -  - -</configuration> Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,229 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <key>org.gatein.integration.wsrp.WSRPServiceIntegration</key> + <type>org.gatein.integration.wsrp.WSRPServiceIntegration</type> + <init-params> + <value-param> + <name>producerConfigLocation</name> + <description>Location of the default producer configuration file</description> + <value>conf/wsrp-producer-config.xml</value> + </value-param> + <value-param> + <name>consumersConfigLocation</name> + <description>Location of the default consumers configuration file</description> + <value>conf/wsrp-consumers-config.xml</value> + </value-param> + </init-params> + </component> + +  + <component> + <type>org.gatein.portal.wsrp.wss.JBoss5WSSServiceIntegration</type> + </component> + + + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/> + <property name="pc" value="http://www.gatein.org/jcr/pc/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value> + <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value> + <value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value> + <value>war:/conf/wsrp/producer-pc-nodetypes.xml</value> + <value>war:/conf/wsrp/migration-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.application.registry.ApplicationRegistryService</target-component> + <component-plugin> + <name>new.portal.portlets.registry</name> + <set-method>initListener</set-method> + <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type> + <description>this listener init the portlets are registered in PortletRegister</description> + <init-params> + <object-param> + <name>administration</name> + <description>description</description> + <object type="org.exoplatform.application.registry.ApplicationCategory"> + <field name="name"> + <string>WSRP</string> + </field> + <field name="displayName"> + <string>WSRP</string> + </field> + <field name="description"> + <string>WSRP administration</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/administrators</string> + </value> + <value> + <string>*:/organization/management/executive-board</string> + </value> + </collection> + </field> + <field name="applications"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.application.registry.Application"> + <field name="applicationName"> + <string>WSRPConfigurationPortlet</string> + </field> + <field name="categoryName"> + <string>WSRP</string> + </field> + <field name="displayName"> + <string>WSRP Configuration</string> + </field> + <field name="description"> + <string>WSRP Configuration</string> + </field> + <field name="type"> + <string>portlet</string> + </field> + <field name="contentId"> + <string>wsrp-admin-gui/WSRPConfigurationPortlet</string> + </field> + <field name="accessPermissions"> + <collection type="java.util.ArrayList" item-type="java.lang.String"> + <value> + <string>*:/platform/administrators</string> + </value> + <value> + <string>*:/organization/management/executive-board</string> + </value> + </collection> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> + <component-plugin> +  + <name>new.portal.config.user.listener</name> +  + <set-method>initListener</set-method> +  + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>platform/administrators</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>war:/conf/wsrp/portal</string> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + + +  + +</configuration> Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - id="WebApp_ID" version="2.5"> - - <display-name>gatein-wsrp-integration</display-name> - -  -  -  - <listener> - <listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> - </listener> -</web-app> \ No newline at end of file Copied: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + id="WebApp_ID" version="2.5"> + + <display-name>gatein-wsrp-integration</display-name> + +  +  +  + <listener> + <listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> + </listener> +</web-app> \ No newline at end of file Deleted: portal/trunk/wsrp-integration/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/pom.xml 2011-03-15 10:46:42 UTC (rev 6031) +++ portal/trunk/wsrp-integration/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -1,49 +0,0 @@ - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>GateIn WSRP Integration</name> - - <groupId>org.gatein.integration</groupId> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>1.0.0-Beta01-SNAPSHOT</version> - - <packaging>pom</packaging> - - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </parent> - - <description>GateIn WSRP Integration extension parent</description> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear</module> - </modules> -</project> \ No newline at end of file Copied: portal/trunk/wsrp-integration/pom.xml (from rev 6031, portal/branches/wsrp-extraction/wsrp-integration/pom.xml) =================================================================== --- portal/trunk/wsrp-integration/pom.xml (rev 0) +++ portal/trunk/wsrp-integration/pom.xml 2011-03-15 14:23:31 UTC (rev 6033) @@ -0,0 +1,49 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>GateIn WSRP Integration</name> + + <groupId>org.gatein.integration</groupId> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <version>1.0.0-Beta01-SNAPSHOT</version> + + <packaging>pom</packaging> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + + <description>GateIn WSRP Integration extension parent</description> + <modules> + <module>extension-config</module> + <module>extension-component</module> + <module>extension-war</module> + <module>extension-ear</module> + </modules> +</project> \ No newline at end of file

13 years, 3 months

1
0
0 / 0

gatein SVN: r6032 - epp/portal/branches.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-03-15 10:02:40 -0400 (Tue, 15 Mar 2011) New Revision: 6032 Added: epp/portal/branches/EPP_5_1_RH_Branch/ Log: Create new branch

13 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits March 2011