May 2011 - gatein-commits - Jboss List Archives

gatein SVN: r6519 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-05-20 13:28:52 -0400 (Fri, 20 May 2011) New Revision: 6519 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java Log: - GTNWSRP-50: avoid regenerating RegistrationData when not needed. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-05-20 14:56:16 UTC (rev 6518) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-05-20 17:28:52 UTC (rev 6519) @@ -45,7 +45,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Set; @@ -67,6 +66,7 @@ private transient Boolean requiresRegistration; private transient Boolean consistentWithProducerExpectations; private transient RegistrationData registrationData; + private transient boolean regenerateRegistrationData; private transient boolean modifiedSinceLastRefresh; private transient boolean modifyRegistrationNeeded; private transient ProducerInfo parent; @@ -233,7 +233,8 @@ } /** - * Determines whether it has been determined after querying the associated Producer that it does <strong>NOT</strong> + * Determines whether it has been determined after querying the associated Producer that it does + * <strong>NOT</strong> * require registration. * * @return <code>true</code> if and only if the associated Producer has been queried and does NOT mandate @@ -262,23 +263,28 @@ public RegistrationData getRegistrationData() { - registrationData = WSRPTypeFactory.createDefaultRegistrationData(); - registrationData.setConsumerName(persistentConsumerName); - List<Property> properties = new ArrayList<Property>(); - Map regProps = getRegistrationProperties(false); - if (!regProps.isEmpty()) + if (registrationData == null || regenerateRegistrationData) { - for (Object o : regProps.values()) + registrationData = WSRPTypeFactory.createDefaultRegistrationData(); + registrationData.setConsumerName(persistentConsumerName); + List<Property> properties = new ArrayList<Property>(); + Map regProps = getRegistrationProperties(false); + if (!regProps.isEmpty()) { - RegistrationProperty prop = (RegistrationProperty)o; - String value = prop.getValue(); - if (value != null && !prop.isDeterminedInvalid()) + for (Object o : regProps.values()) { - properties.add(WSRPTypeFactory.createProperty(prop.getName(), prop.getLang(), prop.getValue())); + RegistrationProperty prop = (RegistrationProperty)o; + String value = prop.getValue(); + if (value != null && !prop.isDeterminedInvalid()) + { + properties.add(WSRPTypeFactory.createProperty(prop.getName(), prop.getLang(), prop.getValue())); + } } + + registrationData.getRegistrationProperties().addAll(properties); } - registrationData.getRegistrationProperties().addAll(properties); + regenerateRegistrationData = false; } return registrationData; @@ -395,6 +401,7 @@ public void setRegistrationProperties(Map registrationProperties) { this.persistentRegistrationProperties = registrationProperties; + regenerateRegistrationData = true; } Set<QName> getRegistrationPropertyNames() @@ -733,6 +740,8 @@ { setModifyRegistrationNeeded(true); } + + regenerateRegistrationData = true; } private void setModifyRegistrationNeeded(boolean modifyRegistrationNeeded)

13 years, 1 month

1
0
0 / 0

gatein SVN: r6518 - sandbox/as7_support/wci/test/servers/jboss42.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-05-20 10:56:16 -0400 (Fri, 20 May 2011) New Revision: 6518 Modified: sandbox/as7_support/wci/test/servers/jboss42/pom.xml Log: Pom referenced wrong parent version - causing clean repo builds to fail Modified: sandbox/as7_support/wci/test/servers/jboss42/pom.xml =================================================================== --- sandbox/as7_support/wci/test/servers/jboss42/pom.xml 2011-05-20 13:35:32 UTC (rev 6517) +++ sandbox/as7_support/wci/test/servers/jboss42/pom.xml 2011-05-20 14:56:16 UTC (rev 6518) @@ -1,418 +1,418 @@ -<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.wci</groupId> - <artifactId>wci-test-server-parent</artifactId> - <version>2.1.0-Alpha04-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>wci-test-jboss42</artifactId> - <packaging>jar</packaging> - <name>GateIn - WCI JBoss 4.2 test component</name> - - <dependencies> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat6</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-exo</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-test-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-test-native-portlet</artifactId> - <scope>test</scope> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-test-gatein-portlet</artifactId> - <scope>test</scope> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-test-exo-portlet</artifactId> - <scope>test</scope> - <type>war</type> - </dependency> - - <dependency> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-mc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-logging</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-remote</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-mc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test-generic</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </exclusion> - </exclusions> - </dependency> -  - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-serialization</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> - <scope>test</scope> - </dependency> - - </dependencies> - - - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-common-build.xml</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>test</finalName> - <appendAssemblyId>true</appendAssemblyId> -  - <attach>false</attach> - <outputDirectory>${project.build.directory}/test-archives</outputDirectory> - <descriptors> - <descriptor>src/assembly/spi-native-server.xml</descriptor> - <descriptor>src/assembly/spi-generic-server.xml</descriptor> - <descriptor>src/assembly/spi-exo-server.xml</descriptor> - <descriptor>src/assembly/endpoint-default-servlet-mapping.xml</descriptor> - <descriptor>src/assembly/endpoint-path-mapping.xml</descriptor> - <descriptor>src/assembly/endpoint-root-path-mapping.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>assemble</id> - <phase>test</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <version>1.3</version> - <executions> - <execution> - <id>integration-testing</id> - <phase>integration-test</phase> - <configuration> - <tasks> - -  - <property name="project.build.directory" value="${project.build.directory}" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - -  -  - <condition property="test.generic.enable"> - <istrue value="${test.generic}" /> - </condition> - <condition property="test.native.enable"> - <istrue value="${test.native}" /> - </condition> - <condition property="test.exo.enable"> - <istrue value="${test.exo}" /> - </condition> - <condition property="test.endpoint.enable"> - <istrue value="${test.endpoint}" /> - </condition> - <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug" /> - </condition> - <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug" /> - </not> - </condition> -  - -  - <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" /> - <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" /> - <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" /> - <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" /> - <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" /> - <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> - <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" /> - <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}" /> - <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" /> - <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" /> - <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> - <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" /> - <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> - <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> - -  - <property name="test.archives.directory" value="${project.build.directory}/test-archives" /> - <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" /> - <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" /> - <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" /> - - <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" /> - <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" /> - <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" /> - - <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> - <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> - <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> - -  - <property name="common.xml.file" value="${test.common.xml}" /> -  - - <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true"> - <target name="tests" /> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <properties> - </properties> - - <profiles> - <profile> - <id>all</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <test.generic>true</test.generic> - <test.native>true</test.native> - <test.exo>true</test.exo> - <test.endpoint>true</test.endpoint> - </properties> - </profile> - <profile> - <id>generic</id> - <properties> - <test.generic>true</test.generic> - </properties> - </profile> - <profile> - <id>native</id> - <properties> - <test.native>true</test.native> - </properties> - </profile> - <profile> - <id>exo</id> - <properties> - <test.exo>true</test.exo> - </properties> - </profile> - <profile> - <id>endpoint</id> - <properties> - <test.endpoint>true</test.endpoint> - </properties> - </profile> - <profile> - <id>cargo.debug</id> - <properties> - <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> - </properties> - </profile> - </profiles> -</project> +<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.wci</groupId> + <artifactId>wci-test-server-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-jboss42</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI JBoss 4.2 test component</name> + + <dependencies> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat6</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-gatein-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-exo-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + + <dependency> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-mc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-remote</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-mc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-ant</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> +  + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> + + </dependencies> + + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-common-build.xml</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>test</finalName> + <appendAssemblyId>true</appendAssemblyId> +  + <attach>false</attach> + <outputDirectory>${project.build.directory}/test-archives</outputDirectory> + <descriptors> + <descriptor>src/assembly/spi-native-server.xml</descriptor> + <descriptor>src/assembly/spi-generic-server.xml</descriptor> + <descriptor>src/assembly/spi-exo-server.xml</descriptor> + <descriptor>src/assembly/endpoint-default-servlet-mapping.xml</descriptor> + <descriptor>src/assembly/endpoint-path-mapping.xml</descriptor> + <descriptor>src/assembly/endpoint-root-path-mapping.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>assemble</id> + <phase>test</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-ant</artifactId> + <version>${version.jboss.unit}</version> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + <version>${version.jboss.unit}</version> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + <version>${version.cargo}</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + <version>1.3</version> + <executions> + <execution> + <id>integration-testing</id> + <phase>integration-test</phase> + <configuration> + <tasks> + +  + <property name="project.build.directory" value="${project.build.directory}" /> + <property name="plugin_classpath" refid="maven.plugin.classpath" /> + <property name="test_classpath" refid="maven.test.classpath" /> + +  +  + <condition property="test.generic.enable"> + <istrue value="${test.generic}" /> + </condition> + <condition property="test.native.enable"> + <istrue value="${test.native}" /> + </condition> + <condition property="test.exo.enable"> + <istrue value="${test.exo}" /> + </condition> + <condition property="test.endpoint.enable"> + <istrue value="${test.endpoint}" /> + </condition> + <condition property="cargo.debug" value="${test.cargo.debug}"> + <isset property="test.cargo.debug" /> + </condition> + <condition property="cargo.debug" value=""> + <not> + <isset property="test.cargo.debug" /> + </not> + </condition> +  + +  + <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" /> + <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" /> + <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" /> + <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" /> + <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" /> + <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> + <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" /> + <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}" /> + <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" /> + <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" /> + <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> + <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" /> + <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> + <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> + +  + <property name="test.archives.directory" value="${project.build.directory}/test-archives" /> + <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" /> + <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" /> + <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" /> + + <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" /> + <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" /> + <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" /> + + <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> + <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> + <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> + +  + <property name="common.xml.file" value="${test.common.xml}" /> +  + + <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true"> + <target name="tests" /> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + </properties> + + <profiles> + <profile> + <id>all</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <test.generic>true</test.generic> + <test.native>true</test.native> + <test.exo>true</test.exo> + <test.endpoint>true</test.endpoint> + </properties> + </profile> + <profile> + <id>generic</id> + <properties> + <test.generic>true</test.generic> + </properties> + </profile> + <profile> + <id>native</id> + <properties> + <test.native>true</test.native> + </properties> + </profile> + <profile> + <id>exo</id> + <properties> + <test.exo>true</test.exo> + </properties> + </profile> + <profile> + <id>endpoint</id> + <properties> + <test.endpoint>true</test.endpoint> + </properties> + </profile> + <profile> + <id>cargo.debug</id> + <properties> + <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> + </properties> + </profile> + </profiles> +</project>

13 years, 1 month

1
0
0 / 0

gatein SVN: r6517 - components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-05-20 09:35:32 -0400 (Fri, 20 May 2011) New Revision: 6517 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/ServiceDescriptionHandler.java Log: - GTNWSRP-45: Now create all the different portlet descriptions for each supported languages by the portlet when a portlet is deployed so that it can be immediately returned when needed and service description can be adapted to desired locales. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/ServiceDescriptionHandler.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/ServiceDescriptionHandler.java 2011-05-20 13:33:28 UTC (rev 6516) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/ServiceDescriptionHandler.java 2011-05-20 13:35:32 UTC (rev 6517) @@ -75,6 +75,7 @@ import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -235,7 +236,7 @@ private long lastGenerated; private Map<QName, EventDescription> eventDescriptions; private Map<QName, Integer> eventReferenceCount; - private Map<String, PortletDescription> portletDescriptions; + private Map<String, PortletDescriptionInfo> portletDescriptions; private ModelDescription registrationProperties; private boolean initialized = false; private boolean requireRegistrations; @@ -250,7 +251,7 @@ lastGenerated = 0; eventDescriptions = new HashMap<QName, EventDescription>(37); eventReferenceCount = new HashMap<QName, Integer>(37); - portletDescriptions = new HashMap<String, PortletDescription>(37); + portletDescriptions = new HashMap<String, PortletDescriptionInfo>(37); registrationProperties = null; initialized = false; requireRegistrations = false; @@ -319,44 +320,24 @@ serviceDescription.setRegistrationPropertyDescription(registrationProperties); serviceDescription.setRequiresRegistration(requireRegistrations); - // find the appropriate language to use - String language = null; - if (desiredLocales != null) - { - for (String desired : desiredLocales) - { - if (supportedLocales.contains(desired)) - { - language = desired; - } - } - } - if (language == null) - { - language = WSRPUtils.toString(Locale.getDefault()); - } - - Collection<PortletDescription> portlets; if (needsPortletDescriptions) { // if we have a list of portlet handles, filter the list of offered portlets - if (ParameterValidation.existsAndIsNotEmpty(portletHandles)) + if (!ParameterValidation.existsAndIsNotEmpty(portletHandles)) { - portlets = new ArrayList<PortletDescription>(portletHandles.size()); - for (String handle : portletHandles) + portletHandles = new ArrayList<String>(portletDescriptions.keySet()); + } + + portlets = new ArrayList<PortletDescription>(portletHandles.size()); + for (String handle : portletHandles) + { + PortletDescription description = getPortletDescription(handle, desiredLocales); + if (description != null) { - PortletDescription description = getPortletDescription(handle); - if (description != null) - { - portlets.add(description); - } + portlets.add(description); } } - else - { - portlets = portletDescriptions.values(); - } serviceDescription.getOfferedPortlets().addAll(portlets); } @@ -418,87 +399,14 @@ private void addPortletDescription(org.gatein.pc.api.PortletContext context, PortletInfo info) { - List<String> locales = producer.getSupportedLocales(); - String handle = context.getId(); - PortletDescription desc = createPortletDescription(info, locales, handle); + PortletDescriptionInfo desc = createPortletDescription(info, handle); portletDescriptions.put(handle, desc); } - /** - * TODO: Adapt to desired locales - * - * @param context - * @param desiredLocales - * @param registration - * @return - */ - public PortletDescription getPortletDescription(PortletContext context, List<String> desiredLocales, Registration registration) + private PortletDescriptionInfo createPortletDescription(PortletInfo info, String handle) { - initIfNeeded(); - - org.gatein.pc.api.PortletContext pcContext = WSRPUtils.convertToPortalPortletContext(context); - if (producer.getRegistrationManager().getPolicy().allowAccessTo(pcContext, registration, "getPortletDescription")) - { - PortletDescription description = getPortletDescription(context.getPortletHandle()); - - if (description == null) - { - // check if we asked for the description of a clone - if (registration.knows(pcContext)) - { - try - { - // retrieve initial context from portlet info and get description from it - Portlet portlet = producer.getPortletWith(pcContext, registration); - PortletInfo info = portlet.getInfo(); - org.gatein.pc.api.PortletContext original = org.gatein.pc.api.PortletContext.createPortletContext(info.getApplicationName(), info.getName()); - return getPortletDescription(original.getId()); - } - catch (Exception e) - { - log.debug("Couldn't retrieve portlet " + pcContext, e); - return null; - } - } - } - return description; - } - else - { - return null; - } - } - - private PortletDescription getPortletDescription(final String portletHandle) - { - return portletDescriptions.get(portletHandle); - } - - public void removePortletDescription(org.gatein.pc.api.PortletContext pc) - { - String handle = WSRPUtils.convertToWSRPPortletContext(pc).getPortletHandle(); - - PortletDescription description = portletDescriptions.get(handle); - if (description != null) - { - // deal with events - for (QName event : description.getHandledEvents()) - { - removeEvent(event); - } - for (QName event : description.getPublishedEvents()) - { - removeEvent(event); - } - - portletDescriptions.remove(handle); - } - } - - private PortletDescription createPortletDescription(PortletInfo info, List<String> locales, String handle) - { if (log.isDebugEnabled()) { log.debug("Constructing portlet description for: " + handle); @@ -515,118 +423,130 @@ markupTypes.add(markupType); } - PortletDescription desc = WSRPTypeFactory.createPortletDescription(handle, markupTypes); + MetaInfo metaInfo = info.getMeta(); - // group ID - desc.setGroupID(info.getApplicationName()); - MetaInfo metaInfo = info.getMeta(); - + // iterate over locales and create a portlet description for each Set<Locale> supportedLocales = info.getCapabilities().getAllLocales(); - // find the best locale to use to generate the description - Locale localeMatch = null; - for (String languageTag : locales) + List<String> supportedLanguages; + if (supportedLocales.size() == 0) { - Locale locale = WSRPUtils.getLocale(languageTag); - if (supportedLocales.contains(locale)) - { - localeMatch = locale; - } + // use English as failback per PLT.25.8.1 + supportedLocales = Collections.singleton(Locale.ENGLISH); + supportedLanguages = Collections.singletonList("en"); } - if (localeMatch == null) + else { - localeMatch = Locale.getDefault(); + supportedLanguages = WSRPUtils.convertLocalesToRFC3066LanguageTags(new ArrayList<Locale>(supportedLocales)); } - // description - desc.setDescription(Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), localeMatch)); + PortletDescriptionInfo descriptionInfo = portletDescriptions.get(handle); + if (descriptionInfo == null) + { + descriptionInfo = new PortletDescriptionInfo(supportedLanguages); + portletDescriptions.put(handle, descriptionInfo); + } - // short title - desc.setShortTitle(Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.SHORT_TITLE), localeMatch)); + for (Locale localeMatch : supportedLocales) + { + PortletDescription desc = WSRPTypeFactory.createPortletDescription(handle, markupTypes); - // title - desc.setTitle(Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.TITLE), localeMatch)); + // group ID + desc.setGroupID(info.getApplicationName()); - // display name - desc.setDisplayName(Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME), localeMatch)); + // description + desc.setDescription(Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), localeMatch)); - // keywords - // metaInfo contains comma-separated keywords: we need to extract them into a list - org.oasis.wsrp.v2.LocalizedString concatenatedKeywords = Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.KEYWORDS), localeMatch); - if (concatenatedKeywords != null) - { - String commaSeparatedKeywords = concatenatedKeywords.getValue(); - if (commaSeparatedKeywords != null && commaSeparatedKeywords.length() > 0) + // short title + desc.setShortTitle(Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.SHORT_TITLE), localeMatch)); + + // title + desc.setTitle(Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.TITLE), localeMatch)); + + // display name + desc.setDisplayName(Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME), localeMatch)); + + // keywords + // metaInfo contains comma-separated keywords: we need to extract them into a list + org.oasis.wsrp.v2.LocalizedString concatenatedKeywords = Utils.convertToWSRPLocalizedString(metaInfo.getMetaValue(MetaInfo.KEYWORDS), localeMatch); + if (concatenatedKeywords != null) { - String lang = concatenatedKeywords.getLang(); - String[] keywordArray = commaSeparatedKeywords.split(","); - for (String keyword : keywordArray) + String commaSeparatedKeywords = concatenatedKeywords.getValue(); + if (commaSeparatedKeywords != null && commaSeparatedKeywords.length() > 0) { - // todo: fix resource name - desc.getKeywords().add(WSRPTypeFactory.createLocalizedString(lang, concatenatedKeywords.getResourceName(), keyword.trim())); + String lang = concatenatedKeywords.getLang(); + String[] keywordArray = commaSeparatedKeywords.split(","); + for (String keyword : keywordArray) + { + // todo: fix resource name + desc.getKeywords().add(WSRPTypeFactory.createLocalizedString(lang, concatenatedKeywords.getResourceName(), keyword.trim())); + } } } - } - // events - EventingInfo eventsInfo = info.getEventing(); - if (eventsInfo != null) - { - Map<QName, ? extends EventInfo> producedEvents = eventsInfo.getProducedEvents(); - if (ParameterValidation.existsAndIsNotEmpty(producedEvents)) + // events + EventingInfo eventsInfo = info.getEventing(); + if (eventsInfo != null) { - List<QName> publishedEvents = desc.getPublishedEvents(); - for (Map.Entry<QName, ? extends EventInfo> entry : producedEvents.entrySet()) + Map<QName, ? extends EventInfo> producedEvents = eventsInfo.getProducedEvents(); + if (ParameterValidation.existsAndIsNotEmpty(producedEvents)) { - publishedEvents.add(entry.getKey()); - addEventInfo(entry.getValue(), localeMatch); + List<QName> publishedEvents = desc.getPublishedEvents(); + for (Map.Entry<QName, ? extends EventInfo> entry : producedEvents.entrySet()) + { + publishedEvents.add(entry.getKey()); + addEventInfo(entry.getValue(), localeMatch); + } } - } - Map<QName, ? extends EventInfo> consumedEvents = eventsInfo.getConsumedEvents(); - if (ParameterValidation.existsAndIsNotEmpty(consumedEvents)) - { - List<QName> handledEvents = desc.getHandledEvents(); - for (Map.Entry<QName, ? extends EventInfo> entry : consumedEvents.entrySet()) + Map<QName, ? extends EventInfo> consumedEvents = eventsInfo.getConsumedEvents(); + if (ParameterValidation.existsAndIsNotEmpty(consumedEvents)) { - handledEvents.add(entry.getKey()); - addEventInfo(entry.getValue(), localeMatch); + List<QName> handledEvents = desc.getHandledEvents(); + for (Map.Entry<QName, ? extends EventInfo> entry : consumedEvents.entrySet()) + { + handledEvents.add(entry.getKey()); + addEventInfo(entry.getValue(), localeMatch); + } } } - } - // public parameters - NavigationInfo navigationInfo = info.getNavigation(); - if (navigationInfo != null) - { - Collection<? extends ParameterInfo> parameterInfos = navigationInfo.getPublicParameters(); - if (ParameterValidation.existsAndIsNotEmpty(parameterInfos)) + // public parameters + NavigationInfo navigationInfo = info.getNavigation(); + if (navigationInfo != null) { - List<ParameterDescription> publicValueDescriptions = desc.getNavigationalPublicValueDescriptions(); - for (ParameterInfo parameterInfo : parameterInfos) + Collection<? extends ParameterInfo> parameterInfos = navigationInfo.getPublicParameters(); + if (ParameterValidation.existsAndIsNotEmpty(parameterInfos)) { - String id = parameterInfo.getId(); - ParameterDescription paramDesc = WSRPTypeFactory.createParameterDescription(id); - paramDesc.setDescription(Utils.convertToWSRPLocalizedString(parameterInfo.getDescription(), localeMatch)); - paramDesc.setLabel(WSRPTypeFactory.createLocalizedString(id)); - List<QName> names = paramDesc.getNames(); - names.add(parameterInfo.getName()); - Collection<QName> aliases = parameterInfo.getAliases(); - if (ParameterValidation.existsAndIsNotEmpty(aliases)) + List<ParameterDescription> publicValueDescriptions = desc.getNavigationalPublicValueDescriptions(); + for (ParameterInfo parameterInfo : parameterInfos) { - names.addAll(aliases); + String id = parameterInfo.getId(); + ParameterDescription paramDesc = WSRPTypeFactory.createParameterDescription(id); + paramDesc.setDescription(Utils.convertToWSRPLocalizedString(parameterInfo.getDescription(), localeMatch)); + paramDesc.setLabel(WSRPTypeFactory.createLocalizedString(id)); + List<QName> names = paramDesc.getNames(); + names.add(parameterInfo.getName()); + Collection<QName> aliases = parameterInfo.getAliases(); + if (ParameterValidation.existsAndIsNotEmpty(aliases)) + { + names.addAll(aliases); + } + + publicValueDescriptions.add(paramDesc); } - - publicValueDescriptions.add(paramDesc); } } - } - // security - SecurityInfo secInfo = info.getSecurity(); - if (secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL) - || secInfo.containsTransportGuarantee(TransportGuarantee.CONFIDENTIAL)) - { - desc.setOnlySecure(true); + // security + SecurityInfo secInfo = info.getSecurity(); + if (secInfo.containsTransportGuarantee(TransportGuarantee.INTEGRAL) + || secInfo.containsTransportGuarantee(TransportGuarantee.CONFIDENTIAL)) + { + desc.setOnlySecure(true); + } + + // add the portlet description to the appropriate PortletDescriptionInfo + descriptionInfo.addDescriptionFor(WSRPUtils.toString(localeMatch), desc); } /* todo: @@ -643,23 +563,98 @@ *[O]boolean mayReturnPortletState *[O]Extension extensions[] */ - return desc; + + return descriptionInfo; } - /*private class PortletDescriptionInfo + /** + * @param context + * @param desiredLocales + * @param registration + * @return + */ + public PortletDescription getPortletDescription(PortletContext context, List<String> desiredLocales, Registration registration) { + initIfNeeded(); + + org.gatein.pc.api.PortletContext pcContext = WSRPUtils.convertToPortalPortletContext(context); + if (producer.getRegistrationManager().getPolicy().allowAccessTo(pcContext, registration, "getPortletDescription")) + { + PortletDescription description = getPortletDescription(context.getPortletHandle(), desiredLocales); + + if (description == null) + { + // check if we asked for the description of a clone + if (registration.knows(pcContext)) + { + try + { + // retrieve initial context from portlet info and get description from it + Portlet portlet = producer.getPortletWith(pcContext, registration); + PortletInfo info = portlet.getInfo(); + org.gatein.pc.api.PortletContext original = org.gatein.pc.api.PortletContext.createPortletContext(info.getApplicationName(), info.getName()); + return getPortletDescription(original.getId(), desiredLocales); + } + catch (Exception e) + { + log.debug("Couldn't retrieve portlet " + pcContext, e); + return null; + } + } + } + return description; + } + else + { + return null; + } + } + + private PortletDescription getPortletDescription(final String portletHandle, List<String> desiredLocales) + { + PortletDescriptionInfo descriptionInfo = portletDescriptions.get(portletHandle); + if (descriptionInfo != null) + { + return descriptionInfo.getBestDescriptionFor(desiredLocales); + } + else + { + return null; + } + } + + public void removePortletDescription(org.gatein.pc.api.PortletContext pc) + { + String handle = WSRPUtils.convertToWSRPPortletContext(pc).getPortletHandle(); + + PortletDescription description = getPortletDescription(handle, null); + if (description != null) + { + // deal with events + for (QName event : description.getHandledEvents()) + { + removeEvent(event); + } + for (QName event : description.getPublishedEvents()) + { + removeEvent(event); + } + + portletDescriptions.remove(handle); + } + } + + private class PortletDescriptionInfo + { private Map<String, PortletDescription> languageToDescription; - private String defaultLanguage; - private PortletDescriptionInfo(String defaultLanguage, PortletDescription description, Set<String> supportedLanguages) + private PortletDescriptionInfo(List<String> supportedLanguages) { - this.defaultLanguage = defaultLanguage; languageToDescription = new HashMap<String, PortletDescription>(supportedLanguages.size()); for (String supportedLanguage : supportedLanguages) { languageToDescription.put(supportedLanguage, null); } - languageToDescription.put(defaultLanguage, description); } public Set<String> getSupportedLanguages() @@ -667,38 +662,50 @@ return languageToDescription.keySet(); } - public PortletDescription getBestDescriptionFor(List<String> desiredLanguages, final PortletInfo info) + public PortletDescription getBestDescriptionFor(List<String> desiredLanguages) { + String language = null; + Set<String> supportedLanguages = getSupportedLanguages(); - String language = null; - for (String languageTag : desiredLanguages) + // check first if we have an exact match + if (desiredLanguages != null) { - if (supportedLanguages.contains(languageTag)) + for (String languageTag : desiredLanguages) { - language = languageTag; + if (supportedLanguages.contains(languageTag)) + { + language = languageTag; + } } + + // if we haven't found an exact match, check if we can find a partial match based on country + if (language == null) + { + for (String desiredLanguage : desiredLanguages) + { + for (String supportedLanguage : supportedLanguages) + { + if (supportedLanguage.startsWith(desiredLanguage)) + { + language = supportedLanguage; + } + } + } + } } if (language == null) { - return languageToDescription.get(defaultLanguage); + language = "en"; // use English as default } - else - { - PortletDescription description = languageToDescription.get(language); - String handle = languageToDescription.get(defaultLanguage).getPortletHandle(); - if (description == null) - { - PortletDescription portletDescription = createPortletDescription(info, desiredLanguages, handle); - languageToDescription.put(language, portletDescription); - return portletDescription; - } - else - { - return description; - } - } + + return languageToDescription.get(language); } - }*/ + + public void addDescriptionFor(String language, PortletDescription desc) + { + languageToDescription.put(language, desc); + } + } } }

13 years, 1 month

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-05-20 09:33:28 -0400 (Fri, 20 May 2011) New Revision: 6516 Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/Utils.java Log: - Renamed WSRPConstants.defaultLocale to DEFAULT_LOCALE and made it public to use it where needed. Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2011-05-20 09:03:50 UTC (rev 6515) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2011-05-20 13:33:28 UTC (rev 6516) @@ -212,13 +212,13 @@ } // init default locale at loading time as it is slow - private static String defaultLocale = WSRPUtils.toString(Locale.getDefault()); + public static String DEFAULT_LOCALE = WSRPUtils.toString(Locale.getDefault()); public static List<String> getDefaultLocales() { // return copy to prevent modifications by client code ArrayList<String> locales = new ArrayList<String>(2); - locales.add(defaultLocale); + locales.add(DEFAULT_LOCALE); locales.add("en"); return locales; } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-05-20 09:03:50 UTC (rev 6515) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-05-20 13:33:28 UTC (rev 6516) @@ -331,7 +331,7 @@ else { // todo: deal with language more appropriately - prop = new RegistrationProperty(name, value, WSRPUtils.toString(Locale.getDefault()), this); + prop = new RegistrationProperty(name, value, WSRPConstants.DEFAULT_LOCALE, this); getOrCreateRegistrationPropertiesMap(false).put(name, prop); } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-05-20 09:03:50 UTC (rev 6515) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-05-20 13:33:28 UTC (rev 6516) @@ -432,7 +432,7 @@ case PropertyChange.PREF_UPDATE: // todo: deal with language more appropriately updates.add(WSRPTypeFactory.createProperty(change.getKey(), - WSRPUtils.toString(Locale.getDefault()), change.getValue().get(0))); + WSRPConstants.DEFAULT_LOCALE, change.getValue().get(0))); break; default: Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/Utils.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/Utils.java 2011-05-20 09:03:50 UTC (rev 6515) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/Utils.java 2011-05-20 13:33:28 UTC (rev 6516) @@ -24,6 +24,7 @@ package org.gatein.wsrp.producer; import org.gatein.common.util.ParameterValidation; +import org.gatein.wsrp.WSRPConstants; import org.gatein.wsrp.WSRPTypeFactory; import org.gatein.wsrp.WSRPUtils; import org.gatein.wsrp.registration.LocalizedString; @@ -232,7 +233,7 @@ if (desiredLocales == null || desiredLocales.isEmpty()) { - desiredLocales = Collections.singletonList(WSRPUtils.toString(Locale.getDefault())); + desiredLocales = Collections.singletonList(WSRPConstants.DEFAULT_LOCALE); } // todo: rewrite getPreferredOrBestLocalizedMappingFor to take a List as argument

13 years, 1 month

1
0
0 / 0

gatein SVN: r6515 - portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2011-05-20 05:03:50 -0400 (Fri, 20 May 2011) New Revision: 6515 Removed: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AddNewCategory.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AddNewEventIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AddNodeIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AddPage.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AdminView.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowLeft.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowLeftPage.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowRight.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowShape.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowShapeButton.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BackIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackBackArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackDownArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackGridRightArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackNextArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackUpArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueActionWheel.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueArrowBlackFloppy.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueBackArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCheckerIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCircleLeftArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCirclePlus.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCircleRightArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCogWheel.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueDottedRightArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueDownArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueFlag.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueInfoBox.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueNextArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueNote.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BluePBox.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueShapeLeftArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueShapeRightArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueSquare.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueUpArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Box.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BreadcumbsArrowIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Briefcase.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BrownBook.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BrowseContent.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Cancel.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/CircleInfo.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/CloneIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ColorPen.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Config.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/CopyIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Cut.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Decorator.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DefaultContainerIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DefaultNodeIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DefaultPageIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DefaultPortletIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DialogIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DotArrowRight.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DoublePaper.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DropIcon16x16.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Duplicate.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DustBin.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DustBinClickButton.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ECMAdmin.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Earth.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/EditNavigation.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/EditNode.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/EditPageNode.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Entertainment.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Error.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Execute.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Feature.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/FloppyDisk.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/FootBall.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ForumIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayBackArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayDownArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayNextArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayShapeLeftArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayShapeRightArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayUpArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenCheckerIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenFlag.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenPlusDataBox.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenPlusPage.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenRightArrowPage.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GridRightArrow.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Hand.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/HighlightEditButton.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Home.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/HotNews.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/IconSelector.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ImagesList.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Info.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/JCRExplorer.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Level.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/LightBlueGlobal.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/LightBulbOn.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/LoadingInfo.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Lock.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Login.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MembershipSelector.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Message.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MiniOrangeBoxPage.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MiscIcons/ portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Monitor.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MoveDown.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MoveUp.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NavigationIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NavigationIcons/ portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NavyMBox.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NestedSquare.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NewsIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Node.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NormalCloseTab.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NormalEditTab.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/OfficeIcons/ portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Operation.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/OrangeLightPage.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/OrangeNote.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/OrangePencilSourceBox.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Organization.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PageTicker.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PasteIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PastePalate.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Pencil.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PermissionSetting.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PortalAdmin.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PortalContainerIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PortalNavigationIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RSS.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RainyCloud.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RedCrossCircle.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RedFlag.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RedLogoutIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RefreshIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RegistryPortlet.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Save.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Scissors.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ScissorsEraser.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ScissorsEraserWarning.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SearchIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SearchIcon.png portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SelectIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SelectPermission.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SelectedCloseTab.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SelectedEditTab.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ShieldGreenPlus.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SiteMap.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SmallArrowBox.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SmallGrayMinus.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SmallGrayPlus.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SmallGroup.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Software.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ToolIcons/ portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/TreeNodeIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/UserAccount.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/UserIcons/ portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/UserRegistration.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Warning.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/WhiteArrowDown.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/WhiteArrowUp.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/WorkflowIcon.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/YellowBulb.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/YellowFlag.gif portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/YellowSquare.gif Log: GTNPORTAL-1839 Cleanup icons of Simple Skin Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AddNewCategory.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AddNewEventIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AddNodeIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AddPage.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/AdminView.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowLeft.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowLeftPage.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowRight.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowShape.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ArrowShapeButton.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BackIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackBackArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackDownArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackGridRightArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackNextArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlackUpArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueActionWheel.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueArrowBlackFloppy.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueBackArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCheckerIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCircleLeftArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCirclePlus.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCircleRightArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueCogWheel.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueDottedRightArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueDownArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueFlag.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueInfoBox.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueNextArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueNote.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BluePBox.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueShapeLeftArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueShapeRightArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueSquare.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BlueUpArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Box.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BreadcumbsArrowIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Briefcase.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BrownBook.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/BrowseContent.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Cancel.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/CircleInfo.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/CloneIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ColorPen.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Config.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/CopyIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Cut.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Decorator.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DefaultContainerIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DefaultNodeIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DefaultPageIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DefaultPortletIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DialogIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DotArrowRight.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DoublePaper.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DropIcon16x16.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Duplicate.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DustBin.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/DustBinClickButton.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ECMAdmin.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Earth.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/EditNavigation.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/EditNode.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/EditPageNode.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Entertainment.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Error.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Execute.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Feature.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/FloppyDisk.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/FootBall.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ForumIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayBackArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayDownArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayNextArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayShapeLeftArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayShapeRightArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GrayUpArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenCheckerIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenFlag.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenPlusDataBox.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenPlusPage.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GreenRightArrowPage.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/GridRightArrow.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Hand.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/HighlightEditButton.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Home.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/HotNews.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/IconSelector.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ImagesList.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Info.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/JCRExplorer.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Level.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/LightBlueGlobal.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/LightBulbOn.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/LoadingInfo.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Lock.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Login.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MembershipSelector.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Message.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MiniOrangeBoxPage.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Monitor.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MoveDown.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/MoveUp.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NavigationIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NavyMBox.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NestedSquare.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NewsIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Node.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NormalCloseTab.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/NormalEditTab.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Operation.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/OrangeLightPage.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/OrangeNote.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/OrangePencilSourceBox.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Organization.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PageTicker.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PasteIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PastePalate.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Pencil.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PermissionSetting.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PortalAdmin.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PortalContainerIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/PortalNavigationIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RSS.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RainyCloud.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RedCrossCircle.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RedFlag.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RedLogoutIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RefreshIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/RegistryPortlet.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Save.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Scissors.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ScissorsEraser.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ScissorsEraserWarning.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SearchIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SearchIcon.png =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SelectIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SelectPermission.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SelectedCloseTab.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SelectedEditTab.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/ShieldGreenPlus.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SiteMap.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SmallArrowBox.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SmallGrayMinus.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SmallGrayPlus.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/SmallGroup.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Software.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/TreeNodeIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/UserAccount.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/UserRegistration.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/Warning.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/WhiteArrowDown.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/WhiteArrowUp.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/WorkflowIcon.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/YellowBulb.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/YellowFlag.gif =================================================================== (Binary files differ) Deleted: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/skinIcons/16x16/icons/YellowSquare.gif =================================================================== (Binary files differ)

13 years, 1 month

1
0
0 / 0

gatein SVN: r6514 - in portal/branches/stax-integration/component/portal/src: test/java/org/exoplatform/portal/stax and 1 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-05-20 04:53:49 -0400 (Fri, 20 May 2011) New Revision: 6514 Added: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/AbstractStAXParserFactory.java portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContentHandler.java portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/GadgetWindowStAXParer.java portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingContainer.java portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingGadgetWindow.java portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPortalConfig.java portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPortletWindow.java portal/branches/stax-integration/component/portal/src/test/resources/stax/container.xml portal/branches/stax-integration/component/portal/src/test/resources/stax/portal.xml portal/branches/stax-integration/component/portal/src/test/resources/stax/portlet-application.xml Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/AbstractStAXParser.java portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageBodyStAXParser.java portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortalConfigStAXParser.java portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPageSet.java Log: GTNPORTAL-1905: Commit GateIn object StAX parser and JUnit tests Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/AbstractStAXParser.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/AbstractStAXParser.java 2011-05-20 08:52:12 UTC (rev 6513) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/AbstractStAXParser.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -21,6 +21,7 @@ import org.exoplatform.portal.config.model.ModelObject; import org.staxnav.StaxNavException; import org.staxnav.StaxNavigator; +import java.util.Set; /** * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> @@ -58,7 +59,7 @@ } else { - throw new StaxNavException(navigator.getLocation(), "Was expecting element " + staxElement + " to be present at the place of " + navigator.getName()); + throw new StaxNavException(navigator.getLocation(), "Was expecting element " + staxElement + " to be present"); } } Added: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/AbstractStAXParserFactory.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/AbstractStAXParserFactory.java (rev 0) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/AbstractStAXParserFactory.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.config.stax; + +import org.staxnav.StaxNavigator; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 5/19/11 + */ +public class AbstractStAXParserFactory +{ + + public static AbstractStAXParser getParser(StAXElement element, StaxNavigator<StAXElement> elementNavigator) + { + switch(element) + { + case page: + return new PageStAXParser(elementNavigator); + case page_body: + return new PageBodyStAXParser(elementNavigator); + case portal_config: + return new PortalConfigStAXParser(elementNavigator); + case portlet_application: + return new PortletWindowStAXParser(elementNavigator); + case gadget_application: + return new GadgetWindowStAXParer(elementNavigator); + case container: + return new ContainerStAXParser(elementNavigator); + default: + throw new IllegalArgumentException("StAXElement " + element + " is not associated with any subclass of ModelObject"); + } + + } +} Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java 2011-05-20 08:52:12 UTC (rev 6513) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -19,6 +19,7 @@ package org.exoplatform.portal.config.stax; import org.exoplatform.portal.config.model.Container; +import org.exoplatform.portal.config.model.ModelObject; import org.staxnav.StaxNavException; import org.staxnav.StaxNavigator; import java.util.HashSet; @@ -41,28 +42,37 @@ { Container container = new Container(); + String templateName = elementNavigator.getAttribute("template"); + if(templateName != null) + { + container.setTemplate(templateName); + } + + container.setDecorator(elementNavigator.getAttribute("decorator")); + container.setWidth(elementNavigator.getAttribute("width")); + container.setHeight(elementNavigator.getAttribute("height")); + + container.setTitle(getContent(elementNavigator, StAXElement.title)); + container.setIcon(getContent(elementNavigator, StAXElement.icon)); + container.setAccessPermissions(getContent(elementNavigator, StAXElement.access_permissions).split(",")); + container.setFactoryId(getContent(elementNavigator, StAXElement.factory_id)); + + final Set<StAXElement> childElementSet = new HashSet<StAXElement>(); childElementSet.add(StAXElement.portlet_application); childElementSet.add(StAXElement.container); - StAXElement tempElement = elementNavigator.next(childElementSet); + elementNavigator.next(childElementSet); + StAXElement tempElement = elementNavigator.getName(); - while(tempElement != null) + while(childElementSet.contains(tempElement)) { - switch(tempElement) - { - case container: - ContainerStAXParser subElementStAXParser = new ContainerStAXParser(elementNavigator); - container.getChildren().add(subElementStAXParser.parseXML()); - break; + //The fork() move current element navigator to its sibling + AbstractStAXParser<ModelObject> modelObjectParser = AbstractStAXParserFactory.getParser(tempElement, elementNavigator.fork()); + ModelObject modelObject = modelObjectParser.parseXML(); + container.getChildren().add(modelObject); - case portlet_application: - PortletWindowStAXParser portletWindowStAXParser = new PortletWindowStAXParser(elementNavigator); - container.getChildren().add(portletWindowStAXParser.parseXML()); - break; - } - - tempElement = elementNavigator.next(childElementSet); + tempElement = elementNavigator.getName(); } return container; @@ -71,6 +81,15 @@ @Override public boolean isOptional(StAXElement staxElement) { - return false; //To change body of implemented methods use File | Settings | File Templates. + switch(staxElement) + { + case access_permissions: + case title: + case icon: + case factory_id: + return true; + default: + return false; + } } } Added: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContentHandler.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContentHandler.java (rev 0) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContentHandler.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.config.stax; + +/** + * A handler handling special content of an XML element + * + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 5/20/11 + */ +public abstract class ContentHandler +{ + + public final static ContentHandler OWNER_PATTERN_HANDLER = new OwnerPatternContentHandler(); + + public abstract String handle(String currentContent, String replacement); + + /** + * A class serves for handling @owner@ pattern + */ + public static class OwnerPatternContentHandler extends ContentHandler + { + + @Override + public String handle(String currentContent, String replacement) + { + if("@owner@".equals(currentContent)) + { + return replacement; + } + else + { + return currentContent; + } + } + } +} Added: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/GadgetWindowStAXParer.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/GadgetWindowStAXParer.java (rev 0) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/GadgetWindowStAXParer.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.config.stax; + +import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.TransientApplicationState; +import org.exoplatform.portal.config.serialize.GadgetApplication; +import org.exoplatform.portal.pom.spi.gadget.Gadget; +import org.staxnav.StaxNavException; +import org.staxnav.StaxNavigator; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 5/19/11 + */ +public class GadgetWindowStAXParer extends AbstractStAXParser<Application<Gadget>> +{ + + public GadgetWindowStAXParer(StaxNavigator<StAXElement> elementNavigator) + { + super(elementNavigator); + } + + @Override + public Application<Gadget> parseXML() throws StaxNavException + { + elementNavigator.next(StAXElement.gadget); + + String gadgetName = getContent(elementNavigator, StAXElement.gadget_ref); + TransientApplicationState<Gadget> state = new TransientApplicationState<Gadget>(gadgetName, null); + Application<Gadget> app = Application.createGadgetApplication(); + app.setState(state); + + return app; + } + + @Override + public boolean isOptional(StAXElement staxElement) + { + switch(staxElement) + { + case gadget_ref: + return false; + default: + return true; + } + } +} Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageBodyStAXParser.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageBodyStAXParser.java 2011-05-20 08:52:12 UTC (rev 6513) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageBodyStAXParser.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -37,12 +37,12 @@ @Override public PageBody parseXML() throws StaxNavException { - return null; //To change body of implemented methods use File | Settings | File Templates. + return new PageBody(); } @Override public boolean isOptional(StAXElement staxElement) { - return false; //To change body of implemented methods use File | Settings | File Templates. + return true; } } Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java 2011-05-20 08:52:12 UTC (rev 6513) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -68,24 +68,17 @@ modelObjectElements.add(StAXElement.portlet_application); modelObjectElements.add(StAXElement.container); - StAXElement tempElement = elementNavigator.next(modelObjectElements); + elementNavigator.next(modelObjectElements); - while(tempElement != null) + StAXElement tempElement = elementNavigator.getName(); + while(modelObjectElements.contains(tempElement)) { - switch(tempElement) - { - case portlet_application: - PortletWindowStAXParser portletWindowStAXParser = new PortletWindowStAXParser(elementNavigator); - children.add(portletWindowStAXParser.parseXML()); - break; + //Call to fork() move the element navigator to sibling of actual element + AbstractStAXParser<ModelObject> modelObjectParser = AbstractStAXParserFactory.getParser(tempElement, elementNavigator.fork()); + ModelObject modelObject = modelObjectParser.parseXML(); + children.add(modelObject); - case container: - ContainerStAXParser containerStAXParser = new ContainerStAXParser(elementNavigator); - children.add(containerStAXParser.parseXML()); - break; - } - - tempElement = elementNavigator.next(modelObjectElements); + tempElement = elementNavigator.getName(); } page.setChildren(children); Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortalConfigStAXParser.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortalConfigStAXParser.java 2011-05-20 08:52:12 UTC (rev 6513) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortalConfigStAXParser.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -18,9 +18,13 @@ */ package org.exoplatform.portal.config.stax; +import org.exoplatform.portal.config.model.ModelObject; import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.config.model.Properties; import org.staxnav.StaxNavException; import org.staxnav.StaxNavigator; +import java.util.HashSet; +import java.util.Set; /** * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> @@ -31,18 +35,70 @@ public PortalConfigStAXParser(StaxNavigator<StAXElement> elementNavigator) throws IllegalArgumentException { - super(elementNavigator); //To change body of overridden methods use File | Settings | File Templates. + super(elementNavigator); } @Override public PortalConfig parseXML() throws StaxNavException { - return null; //To change body of implemented methods use File | Settings | File Templates. + PortalConfig portalConfig = new PortalConfig(); + + portalConfig.setName(getContent(elementNavigator, StAXElement.portal_name)); + portalConfig.setLocale(getContent(elementNavigator, StAXElement.locale)); + portalConfig.setAccessPermissions(getContent(elementNavigator, StAXElement.access_permissions).split(",")); + portalConfig.setEditPermission(getContent(elementNavigator, StAXElement.edit_permission)); + + if(elementNavigator.next(StAXElement.properties)) + { + Properties properties = new Properties(); + StaxNavigator<StAXElement> propertiesElement = elementNavigator.fork(); + + while(elementNavigator.next(StAXElement.entry)) + { + String propertyName = elementNavigator.getAttribute("key"); + String propertyValue = elementNavigator.getContent(); + properties.setProperty(propertyName, propertyValue); + } + + portalConfig.setProperties(properties); + } + + elementNavigator.next(StAXElement.portal_layout);//Parse over portal_layout element + + final Set<StAXElement> modelElementSet = new HashSet<StAXElement>(); + modelElementSet.add(StAXElement.container); + modelElementSet.add(StAXElement.portlet_application); + modelElementSet.add(StAXElement.page_body); + + elementNavigator.next(modelElementSet); + + StAXElement tempElement = elementNavigator.getName(); + while(modelElementSet.contains(tempElement)) + { + //The fork() move current element navigator to its sibling + AbstractStAXParser<ModelObject> modelObjectParser = AbstractStAXParserFactory.getParser(tempElement, elementNavigator.fork()); + ModelObject modelObject = modelObjectParser.parseXML(); + portalConfig.getPortalLayout().getChildren().add(modelObject); + + tempElement = elementNavigator.getName(); + } + + return portalConfig; } @Override public boolean isOptional(StAXElement staxElement) { - return false; //To change body of implemented methods use File | Settings | File Templates. + switch(staxElement) + { + case access_permissions: + case edit_permission: + case properties: + case portal_layout: + return true; + default: + return false; + + } } } Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java 2011-05-20 08:52:12 UTC (rev 6513) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -97,6 +97,8 @@ case icon: case width: case height: + case read_only: + case title: return true; default: Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java 2011-05-20 08:52:12 UTC (rev 6513) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -74,10 +74,26 @@ gadget_application, + gadget, + + gadget_ref, + container, portal_config, + portal_name, + + locale, + + portal_layout, + + page_body, + + properties, + + entry, + NO_SUCH_ELEMENT } Added: portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingContainer.java =================================================================== --- portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingContainer.java (rev 0) +++ portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingContainer.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.stax; + +import junit.framework.TestCase; +import org.exoplatform.portal.config.model.Container; +import org.exoplatform.portal.config.model.ModelObject; +import org.exoplatform.portal.config.stax.ContainerStAXParser; +import org.exoplatform.portal.config.stax.StAXElement; +import org.staxnav.Naming; +import org.staxnav.StaxNavigator; +import org.staxnav.StaxNavigatorImpl; +import java.io.InputStream; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamReader; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 5/20/11 + */ +public class TestParsingContainer extends TestCase +{ + private StaxNavigator<StAXElement> elementNavigator; + + protected void setUp() throws Exception + { + InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream("./stax/container.xml"); + XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + + XMLStreamReader streamReader = inputFactory.createXMLStreamReader(in); + elementNavigator = new StaxNavigatorImpl<StAXElement>(new Naming.Enumerated.Simple(StAXElement.class, StAXElement.NO_SUCH_ELEMENT), streamReader); + } + + public void testContainer() + { + ContainerStAXParser containerParser = new ContainerStAXParser(elementNavigator); + + Container rootContainer = containerParser.parseXML(); + assertEquals(4, rootContainer.getChildren().size()); + + Container firstChild = (Container)rootContainer.getChildren().get(0); + + assertEquals("system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl", firstChild.getTemplate()); + + for(ModelObject descendant : firstChild.getChildren()) + { + assertEquals("system:/groovy/portal/webui/container/UIContainer.gtmpl", ((Container)descendant).getTemplate()); + } + + for(int i = 1; i < 4; i++) + { + assertEquals("system:/groovy/portal/webui/container/UIContainer" + i + ".gtmpl", ((Container)rootContainer.getChildren().get(i)).getTemplate()); + } + + } +} Added: portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingGadgetWindow.java =================================================================== --- portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingGadgetWindow.java (rev 0) +++ portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingGadgetWindow.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.stax; + +import junit.framework.TestCase; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 5/20/11 + */ +public class TestParsingGadgetWindow extends TestCase +{ +} Modified: portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPageSet.java =================================================================== --- portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPageSet.java 2011-05-20 08:52:12 UTC (rev 6513) +++ portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPageSet.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -58,5 +58,11 @@ List<Page> pages = pageSet.getPages(); assertEquals(5, pages.size()); + + assertEquals("homepage", pages.get(0).getName()); + assertEquals("groupnavigation", pages.get(1).getName()); + assertEquals("portalnavigation", pages.get(2).getName()); + assertEquals("register", pages.get(3).getName()); + assertEquals("sitemap", pages.get(4).getName()); } } Added: portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPortalConfig.java =================================================================== --- portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPortalConfig.java (rev 0) +++ portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPortalConfig.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.stax; + +import junit.framework.TestCase; +import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.Container; +import org.exoplatform.portal.config.model.ModelObject; +import org.exoplatform.portal.config.model.PageBody; +import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.config.stax.PortalConfigStAXParser; +import org.exoplatform.portal.config.stax.StAXElement; +import org.json.XML; +import org.staxnav.Naming; +import org.staxnav.StaxNavigator; +import org.staxnav.StaxNavigatorImpl; +import java.io.InputStream; +import java.util.List; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamReader; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 5/20/11 + */ +public class TestParsingPortalConfig extends TestCase +{ + + private StaxNavigator<StAXElement> elementNavigator; + + protected void setUp() throws Exception + { + InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream("./stax/portal.xml"); + XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + + XMLStreamReader streamReader = inputFactory.createXMLStreamReader(in); + elementNavigator = new StaxNavigatorImpl<StAXElement>(new Naming.Enumerated.Simple(StAXElement.class, StAXElement.NO_SUCH_ELEMENT), streamReader); + } + + public void testPortalConfig() + { + PortalConfigStAXParser portalConfigParser = new PortalConfigStAXParser(elementNavigator); + PortalConfig portalConfig = portalConfigParser.parseXML(); + + Container layout = portalConfig.getPortalLayout(); + List<ModelObject> children = layout.getChildren(); + + assertEquals(5, children.size()); + + assertTrue(children.get(0) instanceof Application); + assertTrue(children.get(1) instanceof Application); + assertTrue(children.get(2) instanceof Application); + assertTrue(children.get(3) instanceof PageBody); + assertTrue(children.get(4) instanceof Application); + } + + +} Added: portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPortletWindow.java =================================================================== --- portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPortletWindow.java (rev 0) +++ portal/branches/stax-integration/component/portal/src/test/java/org/exoplatform/portal/stax/TestParsingPortletWindow.java 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.stax; + +import junit.framework.TestCase; +import org.exoplatform.portal.config.stax.StAXElement; +import org.staxnav.Naming; +import org.staxnav.StaxNavigator; +import org.staxnav.StaxNavigatorImpl; +import java.io.InputStream; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamReader; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 5/20/11 + */ +public class TestParsingPortletWindow extends TestCase +{ + + private StaxNavigator<StAXElement> elementNavigator; + + protected void setUp() throws Exception + { + InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream("./stax/portlet-application.xml"); + XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + + XMLStreamReader streamReader = inputFactory.createXMLStreamReader(in); + elementNavigator = new StaxNavigatorImpl<StAXElement>(new Naming.Enumerated.Simple(StAXElement.class, StAXElement.NO_SUCH_ELEMENT), streamReader); + } + + public void testPortletApplication() + { + + } +} + Added: portal/branches/stax-integration/component/portal/src/test/resources/stax/container.xml =================================================================== --- portal/branches/stax-integration/component/portal/src/test/resources/stax/container.xml (rev 0) +++ portal/branches/stax-integration/component/portal/src/test/resources/stax/container.xml 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<container> +<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'> + <access-permissions>Everyone</access-permissions> + <container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'> + <access-permissions>Everyone</access-permissions> + </container> + <container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'> + <access-permissions>Everyone</access-permissions> + </container> +</container> + +<container template="system:/groovy/portal/webui/container/UIContainer1.gtmpl"> + <access-permissions>Everyone</access-permissions> +</container> +<container template="system:/groovy/portal/webui/container/UIContainer2.gtmpl"> + <access-permissions>Everyone</access-permissions> +</container> +<container template="system:/groovy/portal/webui/container/UIContainer3.gtmpl"> + <access-permissions>Everyone</access-permissions> +</container> +</container> + Added: portal/branches/stax-integration/component/portal/src/test/resources/stax/portal.xml =================================================================== --- portal/branches/stax-integration/component/portal/src/test/resources/stax/portal.xml (rev 0) +++ portal/branches/stax-integration/component/portal/src/test/resources/stax/portal.xml 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<portal-config + 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"> + <portal-name>classic</portal-name> + <locale>en</locale> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <properties> + <entry key="sessionAlive">onDemand</entry> + </properties> + + <portal-layout> + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>BannerPortlet</portlet-ref> + <preferences> + <preference> + <name>template</name> + <value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>NavigationPortlet</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>BreadcumbsPortlet</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + <page-body> </page-body> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>FooterPortlet</portlet-ref> + <preferences> + <preference> + <name>template</name> + <value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + </portal-layout> + +</portal-config> Added: portal/branches/stax-integration/component/portal/src/test/resources/stax/portlet-application.xml =================================================================== --- portal/branches/stax-integration/component/portal/src/test/resources/stax/portlet-application.xml (rev 0) +++ portal/branches/stax-integration/component/portal/src/test/resources/stax/portlet-application.xml 2011-05-20 08:53:49 UTC (rev 6514) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>HomePagePortlet</portlet-ref> + <preferences> + <preference> + <name>template</name> + <value>system:/templates/groovy/webui/component/UIHomePagePortlet.gtmpl</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <title>Home Page portlet</title> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + <show-application-state>false</show-application-state> + <show-application-mode>false</show-application-mode> +</portlet-application> + +

13 years, 1 month

1
0
0 / 0

gatein SVN: r6513 - in portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin: SimpleSkin/portal/webui/component and 1 other directory.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2011-05-20 04:52:12 -0400 (Fri, 20 May 2011) New Revision: 6513 Modified: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css Log: GTNPORTAL-1875 IE7 - Edit Page screen in Simple Skin Modified: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css =================================================================== --- portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css 2011-05-20 08:33:27 UTC (rev 6512) +++ portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css 2011-05-20 08:52:12 UTC (rev 6513) @@ -23,7 +23,6 @@ @import url(/eXoResources/skin/DefaultSkin/portal/webui/component/customization/Stylesheet.css); @import url(/eXoResources/skin/DefaultSkin/portal/webui/component/view/Stylesheet.css); @import url(/eXoResources/skin/DefaultSkin/portal/webui/component/widget/Stylesheet.css); -@import url(/eXoResources/skin/DefaultSkin/webui/component/Stylesheet.css); @import url(view/Stylesheet.css); Modified: portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2011-05-20 08:33:27 UTC (rev 6512) +++ portal/branches/branch-GTNPORTAL-1872/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2011-05-20 08:52:12 UTC (rev 6513) @@ -17,6 +17,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ +@import url(/eXoResources/skin/DefaultSkin/webui/component/Stylesheet.css); @import url(SimpleSkin/portal/webui/component/UIPortalApplicationSkin.css); @import url(SimpleSkin/webui/component/Stylesheet.css); @import url(PortletThemes/Stylesheet.css);

13 years, 1 month

1
0
0 / 0

gatein SVN: r6512 - epp/portal/branches/EPP-5-1-tmp.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-05-20 04:33:27 -0400 (Fri, 20 May 2011) New Revision: 6512 Modified: epp/portal/branches/EPP-5-1-tmp/pom.xml Log: Change name for better recognition Modified: epp/portal/branches/EPP-5-1-tmp/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/pom.xml 2011-05-20 08:21:35 UTC (rev 6511) +++ epp/portal/branches/EPP-5-1-tmp/pom.xml 2011-05-20 08:33:27 UTC (rev 6512) @@ -34,7 +34,7 @@ <version>5.1.1-epp-CR01-SNAPSHOT</version> <packaging>pom</packaging> - <name>EPP GateIn - Portal</name> + <name>EPP TMP GateIn - Portal</name> <properties> <org.exoplatform.kernel.version>2.2.8-GA</org.exoplatform.kernel.version>

13 years, 1 month

1
0
0 / 0

gatein SVN: r6511 - in epp/portal/branches/EPP-5-1-tmp: distribution and 8 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-05-20 04:21:35 -0400 (Fri, 20 May 2011) New Revision: 6511 Added: epp/portal/branches/EPP-5-1-tmp/distribution/ epp/portal/branches/EPP-5-1-tmp/distribution/download.xml epp/portal/branches/EPP-5-1-tmp/distribution/eap/ epp/portal/branches/EPP-5-1-tmp/distribution/eap/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/ear/ epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/ epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/ epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/ epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/ epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/ epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/Context.xml epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/src/ epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml Log: Packaging EAP Added: epp/portal/branches/EPP-5-1-tmp/distribution/download.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/download.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/download.xml 2011-05-20 08:21:35 UTC (rev 6511) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="download-jboss" xmlns:mvn="http://maven.apache.org/POM/4.0.0"> + +  + <target name="download-jboss"> + +  + <get dest="${dest}" skipexisting="true"> + <url url="${url}/download"/> + </get> + +  + <get dest="${dest}.sha256" skipexisting="true"> + <url url="${url}.SHA-256/download"/> + </get> + +  + <local name="checksum.matches"/> + <local name="checksum.matches.fail"/> + <checksum file="${dest}" algorithm="sha-256" fileext=".sha256" + verifyproperty="checksum.matches"/> + <condition property="checksum.matches.fail"> + <equals arg1="${checksum.matches}" arg2="false"/> + </condition> + <fail if="checksum.matches.fail">Checksum validation failed! (for: ${dest})</fail> + + </target> + +  + <target name="download-eap"> + +  + <get dest="${dest}" skipexisting="true"> + <url url="${url}"/> + </get> + + </target> + +  + <target name="deploy-to-repo"> + <exec executable="mvn"> + <arg value="install:install-file"/> + <arg value="-DgroupId=bundle"/> + <arg value="-DartifactId=eap"/> + <arg value="-Dversion=5.1.1"/> + <arg value="-Dfile=${file}"/> + <arg value="-Dpackaging=zip"/> + <arg value="-DgeneratePom=true"/> + </exec> + </target> + +  + <target name="downlad-and-deploy-eap" requires="download-eap,deploy-to-repo"/> + +</project> \ No newline at end of file Added: epp/portal/branches/EPP-5-1-tmp/distribution/eap/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/eap/pom.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/eap/pom.xml 2011-05-20 08:21:35 UTC (rev 6511) @@ -0,0 +1,121 @@ + + +<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> + + + <groupId>bundles</groupId> + <artifactId>jboss-eap</artifactId> + <version>5.1.0</version> + <packaging>pom</packaging> + + <name>EAP bundle</name> + + <properties> + <eap.file>${project.artifactId}-${project.version}.zip</eap.file> + <url>http://download.devel.redhat.com/released/JBEAP-5/${project.version}/zip/...</url> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>download</id> + <phase>package</phase> + <configuration> + <target> +  + <get dest="target/${eap.file}" skipexisting="true"> + <url url="${url}"/> + </get> + +  + + + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> +  + + + <plugin> + + <artifactId>maven-install-plugin</artifactId> + <executions> + <execution> + <id>install-zip</id> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>target/${eap.file}</file> + <artifactId>${artifactId}</artifactId> + <groupId>${groupId}</groupId> + <packaging>zip</packaging> + <version>${version}</version> + <generatePom>true</generatePom> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution/ear ___________________________________________________________________ Added: svn:ignore + target Added: epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/ear/pom.xml 2011-05-20 08:21:35 UTC (rev 6511) @@ -0,0 +1,550 @@ +<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> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + </parent> + <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> + <packaging>ear</packaging> + <name>GateIn EAR</name> + <description>GateIn EAR</description> + + <dependencies> +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <version>${project.version}</version> + <type>war</type> + </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.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.security</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.controller</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.server</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.framework</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portlet</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.dashboard</artifactId> + </dependency> + <dependency> + <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> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.jboss.plugin</artifactId> + </dependency> + + +  + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.remote</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + </dependency> + + +  + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + </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-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + </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-integration-api</artifactId> + </dependency> + +  + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ext</artifactId> + </dependency> + +  + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-features</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + </dependency> + +  + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + </dependency> + </dependencies> + + <build> + <finalName>gatein</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>GateIn portal</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + + <modules> +  + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <contextRoot>eXoResources</contextRoot> + <bundleFileName>01eXoResources.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <contextRoot>portal</contextRoot> + <bundleFileName>02portal.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <contextRoot>dashboard</contextRoot> + <bundleFileName>dashboard.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <contextRoot>wsrp-producer</contextRoot> + <bundleFileName>wsrp-producer.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <contextRoot>exoadmin</contextRoot> + <bundleFileName>exoadmin.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <contextRoot>rest</contextRoot> + <bundleFileName>rest.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <contextRoot>eXoGadgets</contextRoot> + <bundleFileName>eXoGadgets.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <contextRoot>web</contextRoot> + <bundleFileName>web.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> + <contextRoot>integration</contextRoot> + <bundleFileName>integration.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + <bundleFileName>wsrp-admin-gui.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <contextRoot>eXoGadgetServer</contextRoot> + <bundleFileName>eXoGadgetServer.war</bundleFileName> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + </build> +  + <repositories> + <repository> + <id>mead</id> + <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <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> + <repository> + <id>oauth</id> + <url>http://oauth.googlecode.com/svn/code/maven</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>exo-int</id> + <url>http://repository.exoplatform.org/content/groups/public</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> +</project> \ No newline at end of file Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution/integration.war ___________________________________________________________________ Added: svn:ignore + target Added: epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/pom.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/pom.xml 2011-05-20 08:21:35 UTC (rev 6511) @@ -0,0 +1,12 @@ +<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> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + </parent> + <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> + <packaging>war</packaging> + <name>GateIn JBoss AS integration.war</name> +</project> \ No newline at end of file Added: epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/Context.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/Context.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/Context.xml 2011-05-20 08:21:35 UTC (rev 6511) @@ -0,0 +1,23 @@ + + +<Context privileged="true">  +</Context> \ No newline at end of file Added: epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/web.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/integration.war/src/main/webapp/WEB-INF/web.xml 2011-05-20 08:21:35 UTC (rev 6511) @@ -0,0 +1,36 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> +</web-app> Added: epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-20 08:21:35 UTC (rev 6511) @@ -0,0 +1,126 @@ +<?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> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + </parent> + + <artifactId>distribution</artifactId> + + <packaging>pom</packaging> + + <name>Distribution</name> + + <properties> + <eap.version>5.1.1.GA</eap.version> + </properties> + + <modules> + <module>integration.war</module> + <module>ear</module> + </modules> + +  + <dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> + <version>${project.version}</version> + <type>ear</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>starter-gatein</artifactId> + <version>${project.version}</version> + <type>ear</type> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-eap</artifactId> + <version>5.1.0</version> + <type>zip</type> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-eap</artifactId> + <version>${eap.version}</version> + <type>zip</type> + </dependency> + </dependencies> + <executions> + <execution> + <id>unpack-zips</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss</groupId> + <artifactId>jboss-eap</artifactId> + <version>${eap.version}</version> + <type>zip</type> + <outputDirectory>${project.build.directory}/work</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-05-20 08:21:35 UTC (rev 6511) @@ -0,0 +1,82 @@ + +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>bin</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + + <dependencySets> + <dependencySet> + <includes> + <include>*:exo.portal.packaging.jboss-as.ear:ear</include> + </includes> + <outputDirectory>jboss-as/server/default/deploy/gatein.ear</outputDirectory> + <outputFileNameMapping>gatein.ear</outputFileNameMapping> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <includes> + <include>*:ear</include> + </includes> + <excludes> + <exclude>*:exo.portal.packaging.jboss-as.ear:ear</exclude> + </excludes> + <outputDirectory>jboss-as/server/default/deploy</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + <dependencySet> + <includes> + <include>*:jar</include> + </includes> + <outputDirectory>jboss-as/server/default/deploy</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + <dependencySet> + <includes> + <include>*:zip</include> + </includes> + <outputDirectory></outputDirectory> + <unpack>true</unpack> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>/opt/AS/jboss-5.1.0.GA</directory> + <outputDirectory>jboss-as</outputDirectory> + </fileSet> + </fileSets> + <files> + <file> + <source>../component/common/src/main/java/conf/configuration-jboss.properties</source> + <outputDirectory>jboss-as/server/default/conf/gatein</outputDirectory> + </file> + <file> + <source>../component/common/src/main/java/conf/configuration.xml</source> + <outputDirectory>jboss-as/server/default/conf/gatein</outputDirectory> + </file> + </files> + +</assembly> \ No newline at end of file

13 years, 1 month

1
0
0 / 0

gatein SVN: r6510 - sandbox/as7_support.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-05-19 14:25:21 -0400 (Thu, 19 May 2011) New Revision: 6510 Modified: sandbox/as7_support/README.txt Log: Instructions for building, packaging and running SimplePortal with JBossAS 7 Modified: sandbox/as7_support/README.txt =================================================================== --- sandbox/as7_support/README.txt 2011-05-19 18:23:03 UTC (rev 6509) +++ sandbox/as7_support/README.txt 2011-05-19 18:25:21 UTC (rev 6510) @@ -10,6 +10,8 @@ cd wci mvn install -Dmaven.test.skip +(Make sure you're using maven 2.2.1 as wci and pc don't work with maven 3 yet due to JBoss Unit AFAICT) + cd .. cd pc mvn install -P\!default,portal -Dmaven.test.skip

13 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits May 2011