June 2011 - gatein-commits - Jboss List Archives

gatein SVN: r6781 - in epp/portal/branches/EPP_5_2_Branch: component/application-registry/src/main/java/org/exoplatform/application/gadget and 7 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-06-30 10:28:21 -0400 (Thu, 30 Jun 2011) New Revision: 6781 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/Source.java epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java epp/portal/branches/EPP_5_2_Branch/settings.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml Log: JBEPP-970 Merge some revisions with gatein/portal: 929, 933, 1051, 1558, 1690 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/Source.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/Source.java 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/Source.java 2011-06-30 14:28:21 UTC (rev 6781) @@ -89,4 +89,4 @@ { return content; } -} \ No newline at end of file +} Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2011-06-30 14:28:21 UTC (rev 6781) @@ -29,7 +29,6 @@ import org.chromattic.ext.ntdef.NTFolder; import org.exoplatform.application.gadget.EncodingDetector; - import java.io.ByteArrayInputStream; import java.util.Date; Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-06-30 14:28:21 UTC (rev 6781) @@ -22,9 +22,8 @@ # JCR gatein.jcr.config.type=local -gatein.jcr.datasource.name=java:gatein-jcr +gatein.jcr.datasource.name=java:jdbcjcr gatein.jcr.datasource.dialect=auto - gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-06-30 14:28:21 UTC (rev 6781) @@ -150,7 +150,7 @@ <profile> <id>epp-distribution-zip</id> <activation> - <activeByDefault>true</activeByDefault> + <activeByDefault>false</activeByDefault> </activation> <build> <plugins> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/WEB-INF/web.xml 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/WEB-INF/web.xml 2011-06-30 14:28:21 UTC (rev 6781) @@ -36,6 +36,7 @@ <url-pattern>/*</url-pattern> </filter-mapping> + <servlet> <servlet-name>GateInServlet</servlet-name> <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> @@ -46,5 +47,5 @@ <servlet-name>GateInServlet</servlet-name> <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> - + </web-app> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-06-30 14:28:21 UTC (rev 6781) @@ -266,4 +266,4 @@ } } -} \ No newline at end of file +} Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java 2011-06-30 14:28:21 UTC (rev 6781) @@ -205,4 +205,4 @@ } } -} \ No newline at end of file +} Modified: epp/portal/branches/EPP_5_2_Branch/settings.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/settings.xml 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/settings.xml 2011-06-30 14:28:21 UTC (rev 6781) @@ -1,80 +1,14 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> -  - -  -<localRepository>${env.HOME}/.m2_EPP</localRepository> +<?xml version="1.0"?> +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - <profiles> - <profile> - <id>my-jboss-maven2</id> - <repositories> - <repository> - <id>jboss-maven2-brew</id> - <name>JBoss Maven 2 Brew Repository</name> - <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>jboss-maven2-nexus</id> - <name>JBoss Maven 2 nexus Repository</name> - <url>https://repository.jboss.org/nexus/content/groups/public</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>jboss-maven2-deprecated</id> - <name>JBoss Maven 2 deprecated Repository</name> - <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - </profile> - - </profiles> - <activeProfiles> - <activeProfile>my-jboss-maven2</activeProfile> - </activeProfiles> - + <localRepository>${env.HOME}/.m2_EPP</localRepository> + + <mirrors> + <mirror> + <id>internal-repository</id> + <name>Maven Repository Manager running on repo.mycompany.com</name> + <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> + <mirrorOf>*</mirrorOf> + </mirror> + </mirrors> </settings> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-06-30 14:28:21 UTC (rev 6781) @@ -122,12 +122,6 @@ <value>jar:/conf/mop-nodetypes.xml</value> <value>jar:/conf/application-nodetypes.xml</value> <value>jar:/conf/content-nodetypes.xml</value> - <value>jar:/conf/autologin-nodetypes.xml</value> - <value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value> - <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value> - <value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value> - <value>war:/conf/wsrp/producer-pc-nodetypes.xml</value> - <value>war:/conf/wsrp/migration-nodetypes.xml</value> </values-param> </init-params> </component-plugin> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2011-06-30 13:09:09 UTC (rev 6780) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/application-registry-configuration.xml 2011-06-30 14:28:21 UTC (rev 6781) @@ -22,6 +22,18 @@ <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + + <component> + <key>org.exoplatform.application.gadget.SourceStorage</key> + <type>org.exoplatform.application.gadget.impl.SourceStorageImpl</type> + + </component> + <component> + <key>org.exoplatform.application.gadget.GadgetRegistryService</key> + <type>org.exoplatform.application.gadget.impl.GadgetRegistryServiceImpl</type> + <init-params> + <value-param> + <name>gadgets.country</name> + <description>US</description> + <value>US</value> + </value-param> + <value-param> + <name>gadgets.language</name> + <description>en</description> + <value>en</value> + </value-param> + <value-param> + <name>gadgets.moduleId</name> + <description>0</description> + <value>0</value> + </value-param> + <value-param> + <name>gadgets.hostName</name> + <description>Gadget server url</description> + <value>eXoGadgetServer/gadgets</value> + </value-param> + <properties-param> + <name>developerInfo</name> + <description>The group that is allowed to develop gadgets</description> + <property name="developer.group" value="/platform/administrators"/> + </properties-param> + </init-params> + </component> + + <component> <key>org.exoplatform.application.gadget.GadgetDeployer</key> <type>org.exoplatform.application.gadget.GadgetDeployer</type> </component> @@ -526,11 +587,11 @@ <component-plugin> <name>chromattic</name> <set-method>addLifeCycle</set-method> - <type>org.exoplatform.application.registry.mop.ApplicationRegistryChromatticLifeCycle</type> + <type>org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type> <init-params> <value-param> <name>name</name> - <value>registry</value> + <value>app</value> </value-param> <value-param> <name>workspace-name</name> @@ -538,10 +599,24 @@ </value-param> <values-param> <name>entities</name> - <value>org.exoplatform.application.registry.mop.ContentRegistry</value> - <value>org.exoplatform.application.registry.mop.CategoryDefinition</value> - <value>org.exoplatform.application.registry.mop.ContentDefinition</value> + <value>org.exoplatform.application.registry.impl.ContentRegistry</value> + <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> + <value>org.exoplatform.application.registry.impl.ContentDefinition</value> + <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> + <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> + <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> + <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> + </values-param> + <properties-param> + <name>options</name> + <property name="org.chromattic.api.Option.root_node.path" value="/production"/> + <property name="org.chromattic.api.Option.root_node.create" value="true"/> + </properties-param> </init-params> </component-plugin> </external-component-plugins>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6780 - epp/portal/branches/EPP_5_2_Branch.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-06-30 09:09:09 -0400 (Thu, 30 Jun 2011) New Revision: 6780 Added: epp/portal/branches/EPP_5_2_Branch/settings-all.xml Log: Maven settings for dev build. Added: epp/portal/branches/EPP_5_2_Branch/settings-all.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/settings-all.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/settings-all.xml 2011-06-30 13:09:09 UTC (rev 6780) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> +  + +  +<localRepository>${env.HOME}/.m2_EPP</localRepository> + + <profiles> + <profile> + <id>my-jboss-maven2</id> + <repositories> + <repository> + <id>jboss-maven2-brew</id> + <name>JBoss Maven 2 Brew Repository</name> + <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>jboss-maven2-nexus</id> + <name>JBoss Maven 2 nexus Repository</name> + <url>https://repository.jboss.org/nexus/content/groups/public</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>jboss-maven2-deprecated</id> + <name>JBoss Maven 2 deprecated Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + </profile> + + </profiles> + <activeProfiles> + <activeProfile>my-jboss-maven2</activeProfile> + </activeProfiles> + +</settings>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6779 - in sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7: deployment and 1 other directory.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-06-30 07:05:46 -0400 (Thu, 30 Jun 2011) New Revision: 6779 Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java Log: Code formatting Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -27,43 +27,52 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public enum Attribute { - UNKNOWN(null); +public enum Attribute +{ + UNKNOWN(null); - private final String name; + private final String name; - Attribute(final String name) { - this.name = name; - } + Attribute(final String name) + { + this.name = name; + } - /** - * Get the local name of this attribute. - * - * @return the local name - */ - public String getLocalName() { - return name; - } + /** + * Get the local name of this attribute. + * + * @return the local name + */ + public String getLocalName() + { + return name; + } - private static final Map<String, Attribute> MAP; + private static final Map<String, Attribute> MAP; - static { - final Map<String, Attribute> map = new HashMap<String, Attribute>(); - for (Attribute element : values()) { - final String name = element.getLocalName(); - if (name != null) - map.put(name, element); - } - MAP = map; - } + static + { + final Map<String, Attribute> map = new HashMap<String, Attribute>(); + for (Attribute element : values()) + { + final String name = element.getLocalName(); + if (name != null) + { + map.put(name, element); + } + } + MAP = map; + } - public static Attribute forName(String localName) { - final Attribute element = MAP.get(localName); - return element == null ? UNKNOWN : element; - } + public static Attribute forName(String localName) + { + final Attribute element = MAP.get(localName); + return element == null ? UNKNOWN : element; + } - @Override - public String toString() { - return getLocalName(); - } + @Override + public String toString() + { + return getLocalName(); + } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -26,7 +26,8 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -interface Constants { +interface Constants +{ String CONTAINER_CONFIG = "configuration"; String WCI_SERVLET_CLASS = "wci-servlet-class"; Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -27,41 +27,49 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public enum Element { - // must be first - UNKNOWN(null), - CONTAINER_CONFIG(Constants.CONTAINER_CONFIG), - WCI_SERVLET_CLASS(Constants.WCI_SERVLET_CLASS); +public enum Element +{ + // must be first + UNKNOWN(null), + CONTAINER_CONFIG(Constants.CONTAINER_CONFIG), + WCI_SERVLET_CLASS(Constants.WCI_SERVLET_CLASS); - private final String name; + private final String name; - Element(final String name) { - this.name = name; - } + Element(final String name) + { + this.name = name; + } - /** - * Get the local name of this element. - * - * @return the local name - */ - public String getLocalName() { - return name; - } + /** + * Get the local name of this element. + * + * @return the local name + */ + public String getLocalName() + { + return name; + } - private static final Map<String, Element> MAP; + private static final Map<String, Element> MAP; - static { - final Map<String, Element> map = new HashMap<String, Element>(); - for (Element element : values()) { - final String name = element.getLocalName(); - if (name != null) - map.put(name, element); - } - MAP = map; - } + static + { + final Map<String, Element> map = new HashMap<String, Element>(); + for (Element element : values()) + { + final String name = element.getLocalName(); + if (name != null) + { + map.put(name, element); + } + } + MAP = map; + } - public static Element forName(String localName) { - final Element element = MAP.get(localName); - return element == null ? UNKNOWN : element; - } + public static Element forName(String localName) + { + final Element element = MAP.get(localName); + return element == null ? UNKNOWN : element; + } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -35,15 +35,19 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInExtension implements Extension { +public class GateInExtension implements Extension +{ private static final Logger log = Logger.getLogger("org.gatein"); public static final String SUBSYSTEM_NAME = "gatein"; - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ @Override - public void initialize(ExtensionContext context) { + public void initialize(ExtensionContext context) + { log.debugf("Activating GateIn Extension"); final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME); final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDescriptionProviders.SUBSYSTEM); @@ -52,9 +56,12 @@ subsystem.registerXMLElementWriter(GateInSubsystemParser.getInstance()); } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ @Override - public void initializeParsers(ExtensionParsingContext context) { - context.setSubsystemXmlMapping(Namespace.CURRENT.getUriString(), GateInSubsystemParser.getInstance()); + public void initializeParsers(ExtensionParsingContext context) + { + context.setSubsystemXmlMapping(Namespace.CURRENT.getUriString(), GateInSubsystemParser.getInstance()); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -40,49 +40,49 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemAdd extends AbstractBoottimeAddStepHandler implements DescriptionProvider { +public class GateInSubsystemAdd extends AbstractBoottimeAddStepHandler implements DescriptionProvider +{ static final GateInSubsystemAdd INSTANCE = new GateInSubsystemAdd(); static final int STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT = 0x0B80; static final int DEPENDENCIES_PORTLET_MODULE = 0x1100; - private GateInSubsystemAdd() { + private GateInSubsystemAdd() + { } - protected void populateModel(ModelNode operation, ModelNode model) { + protected void populateModel(ModelNode operation, ModelNode model) + { ModelNode ourContainerConfig = new ModelNode(); model.get(Constants.CONTAINER_CONFIG).set(ourContainerConfig); } protected void performBoottime(OperationContext context, ModelNode operation, ModelNode model, ServiceVerificationHandler verificationHandler, - List<ServiceController<?>> newControllers) throws OperationFailedException { - final ModelNode config = operation.get(Constants.CONTAINER_CONFIG); - context.addStep(new AbstractDeploymentChainStep() { - protected void execute(DeploymentProcessorTarget processorTarget) { - final SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); + List<ServiceController<?>> newControllers) throws OperationFailedException + { + final ModelNode config = operation.get(Constants.CONTAINER_CONFIG); + context.addStep(new AbstractDeploymentChainStep() + { + protected void execute(DeploymentProcessorTarget processorTarget) + { + final SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); - processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); - processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, - new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); - } - }, OperationContext.Stage.RUNTIME); -/* - final WebServerService service = new WebServerService(defaultVirtualServer, useNative); - newControllers.add(context.getServiceTarget().addService(WebSubsystemServices.JBOSS_WEB, service) - .addDependency(AbstractPathService.pathNameOf(TEMP_DIR), String.class, service.getPathInjector()) - .addDependency(DependencyType.OPTIONAL, ServiceName.JBOSS.append("mbean", "server"), MBeanServer.class, service.getMbeanServer()) - .setInitialMode(Mode.ON_DEMAND) - .install()); -*/ + processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); + processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, + new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); + } + }, OperationContext.Stage.RUNTIME); } - protected boolean requiresRuntimeVerification() { - return false; + protected boolean requiresRuntimeVerification() + { + return false; } - public ModelNode getModelDescription(Locale locale) { + public ModelNode getModelDescription(Locale locale) + { return GateInSubsystemDescriptions.getSubsystemDescription(locale); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -38,30 +38,35 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemDescribe implements OperationStepHandler, DescriptionProvider { +public class GateInSubsystemDescribe implements OperationStepHandler, DescriptionProvider +{ - static final GateInSubsystemDescribe INSTANCE = new GateInSubsystemDescribe(); + static final GateInSubsystemDescribe INSTANCE = new GateInSubsystemDescribe(); - /** {@inheritDoc} */ - @Override - public void execute(OperationContext context, ModelNode operation) throws OperationFailedException - { - final ModelNode result = new ModelNode(); - final PathAddress rootAddress = PathAddress.pathAddress(PathAddress.pathAddress(operation.require(OP_ADDR)).getLastElement()); - final ModelNode subModel = context.readModel(PathAddress.EMPTY_ADDRESS); + /** + * {@inheritDoc} + */ + @Override + public void execute(OperationContext context, ModelNode operation) throws OperationFailedException + { + final ModelNode result = new ModelNode(); + final PathAddress rootAddress = PathAddress.pathAddress(PathAddress.pathAddress(operation.require(OP_ADDR)).getLastElement()); + final ModelNode subModel = context.readModel(PathAddress.EMPTY_ADDRESS); - final ModelNode subsystemAdd = new ModelNode(); - subsystemAdd.get(OP).set(ADD); - subsystemAdd.get(OP_ADDR).set(rootAddress.toModelNode()); - if(subModel.hasDefined(Constants.CONTAINER_CONFIG)) { - subsystemAdd.get(Constants.CONTAINER_CONFIG).set(subModel.get(Constants.CONTAINER_CONFIG)); - } - result.add(subsystemAdd); - context.completeStep(); - } + final ModelNode subsystemAdd = new ModelNode(); + subsystemAdd.get(OP).set(ADD); + subsystemAdd.get(OP_ADDR).set(rootAddress.toModelNode()); + if (subModel.hasDefined(Constants.CONTAINER_CONFIG)) + { + subsystemAdd.get(Constants.CONTAINER_CONFIG).set(subModel.get(Constants.CONTAINER_CONFIG)); + } + result.add(subsystemAdd); + context.completeStep(); + } - @Override - public ModelNode getModelDescription(Locale locale) { - return new ModelNode(); - } + @Override + public ModelNode getModelDescription(Locale locale) + { + return new ModelNode(); + } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -10,11 +10,14 @@ * * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemDescriptionProviders { - public static final DescriptionProvider SUBSYSTEM = new DescriptionProvider() { - @Override - public ModelNode getModelDescription(Locale locale) { - return GateInSubsystemDescriptions.getSubsystemDescription(locale); - } - }; +public class GateInSubsystemDescriptionProviders +{ + public static final DescriptionProvider SUBSYSTEM = new DescriptionProvider() + { + @Override + public ModelNode getModelDescription(Locale locale) + { + return GateInSubsystemDescriptions.getSubsystemDescription(locale); + } + }; } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -32,10 +32,12 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemDescriptions { +public class GateInSubsystemDescriptions +{ static final String RESOURCE_NAME = GateInSubsystemDescriptions.class.getPackage().getName() + ".LocalDescriptions"; - public static ModelNode getSubsystemDescription(final Locale locale) { + public static ModelNode getSubsystemDescription(final Locale locale) + { final ResourceBundle bundle = getResourceBundle(locale); final ModelNode node = new ModelNode(); @@ -53,19 +55,22 @@ return node; } - static ModelNode getConfigurationCommonDescription(final ModelNode node, final ResourceBundle bundle) { + static ModelNode getConfigurationCommonDescription(final ModelNode node, final ResourceBundle bundle) + { - node.get(TYPE).set(ModelType.OBJECT); - node.get(DESCRIPTION).set(bundle.getString("gatein.configuration")); - node.get(REQUIRED).set(false); + node.get(TYPE).set(ModelType.OBJECT); + node.get(DESCRIPTION).set(bundle.getString("gatein.configuration")); + node.get(REQUIRED).set(false); - return node; + return node; } - private static ResourceBundle getResourceBundle(Locale locale) { - if (locale == null) { - locale = Locale.getDefault(); - } - return ResourceBundle.getBundle(RESOURCE_NAME, locale); + private static ResourceBundle getResourceBundle(Locale locale) + { + if (locale == null) + { + locale = Locale.getDefault(); + } + return ResourceBundle.getBundle(RESOURCE_NAME, locale); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -43,11 +43,13 @@ * * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemParser implements XMLStreamConstants, XMLElementReader<List<ModelNode>>, XMLElementWriter<SubsystemMarshallingContext> { +public class GateInSubsystemParser implements XMLStreamConstants, XMLElementReader<List<ModelNode>>, XMLElementWriter<SubsystemMarshallingContext> +{ private static final GateInSubsystemParser INSTANCE = new GateInSubsystemParser(); - static GateInSubsystemParser getInstance() { + static GateInSubsystemParser getInstance() + { return INSTANCE; } @@ -55,19 +57,23 @@ * {@inheritDoc} */ @Override - public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException { + public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException + { context.startSubsystemElement(Namespace.CURRENT.getUriString(), false); ModelNode node = context.getModelNode(); - if (node.hasDefined(CONTAINER_CONFIG)) { + if (node.hasDefined(CONTAINER_CONFIG)) + { writeContainerConfig(writer, node.get(CONTAINER_CONFIG)); } writer.writeEndElement(); } - private void writeContainerConfig(XMLExtendedStreamWriter writer, ModelNode config) throws XMLStreamException { + private void writeContainerConfig(XMLExtendedStreamWriter writer, ModelNode config) throws XMLStreamException + { writer.writeStartElement(Element.CONTAINER_CONFIG.getLocalName()); - if (config.hasDefined(WCI_SERVLET_CLASS)) { + if (config.hasDefined(WCI_SERVLET_CLASS)) + { writer.writeStartElement(Element.WCI_SERVLET_CLASS.getLocalName()); writer.writeCharacters(config.get(WCI_SERVLET_CLASS).asString()); writer.writeEndElement(); @@ -79,9 +85,11 @@ * {@inheritDoc} */ @Override - public void readElement(XMLExtendedStreamReader reader, List<ModelNode> list) throws XMLStreamException { + public void readElement(XMLExtendedStreamReader reader, List<ModelNode> list) throws XMLStreamException + { // no attributes - if (reader.getAttributeCount() > 0) { + if (reader.getAttributeCount() > 0) + { throw unexpectedAttribute(reader, 0); } @@ -93,11 +101,13 @@ subsystem.get(OP).set(ADD); subsystem.get(OP_ADDR).set(address); final int count = reader.getAttributeCount(); - for (int i = 0; i < count; i++) { + for (int i = 0; i < count; i++) + { requireNoNamespaceAttribute(reader, i); final String value = reader.getAttributeValue(i); final Attribute attribute = Attribute.forName(reader.getAttributeLocalName(i)); - switch (attribute) { + switch (attribute) + { default: unexpectedAttribute(reader, i); } @@ -105,40 +115,52 @@ list.add(subsystem); // elements - while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { - switch (Namespace.forUri(reader.getNamespaceURI())) { - case GATEIN_1_0: { + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) + { + switch (Namespace.forUri(reader.getNamespaceURI())) + { + case GATEIN_1_0: + { final Element element = Element.forName(reader.getLocalName()); - switch (element) { - case CONTAINER_CONFIG: { + switch (element) + { + case CONTAINER_CONFIG: + { final ModelNode config = parseContainerConfig(reader); subsystem.get(CONTAINER_CONFIG).set(config); break; } - default: { + default: + { throw unexpectedElement(reader); } } break; } - default: { + default: + { throw unexpectedElement(reader); } } } } - static ModelNode parseContainerConfig(XMLExtendedStreamReader reader) throws XMLStreamException { + static ModelNode parseContainerConfig(XMLExtendedStreamReader reader) throws XMLStreamException + { final ModelNode config = new ModelNode(); // no attributes - if (reader.getAttributeCount() > 0) { + if (reader.getAttributeCount() > 0) + { throw unexpectedAttribute(reader, 0); } // elements - while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) + { final Element element = Element.forName(reader.getLocalName()); - switch (element) { - case WCI_SERVLET_CLASS: { + switch (element) + { + case WCI_SERVLET_CLASS: + { final String wciServletClass = reader.getElementText().trim(); config.get(WCI_SERVLET_CLASS).set(wciServletClass); break; @@ -150,8 +172,10 @@ return config; } - static void writeAttribute(final XMLExtendedStreamWriter writer, final String name, ModelNode node) throws XMLStreamException { - if (node.hasDefined(name)) { + static void writeAttribute(final XMLExtendedStreamWriter writer, final String name, ModelNode node) throws XMLStreamException + { + if (node.hasDefined(name)) + { writer.writeAttribute(name, node.get(name).asString()); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -27,7 +27,8 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public enum Namespace { +public enum Namespace +{ // must be first UNKNOWN(null), @@ -40,8 +41,9 @@ private final String name; - Namespace(final String name) { - this.name = name; + Namespace(final String name) + { + this.name = name; } /** @@ -49,24 +51,30 @@ * * @return the URI */ - public String getUriString() { - return name; + public String getUriString() + { + return name; } private static final Map<String, Namespace> MAP; - static { - final Map<String, Namespace> map = new HashMap<String, Namespace>(); - for (Namespace namespace : values()) { - final String name = namespace.getUriString(); - if (name != null) - map.put(name, namespace); - } - MAP = map; + static + { + final Map<String, Namespace> map = new HashMap<String, Namespace>(); + for (Namespace namespace : values()) + { + final String name = namespace.getUriString(); + if (name != null) + { + map.put(name, namespace); + } + } + MAP = map; } - public static Namespace forUri(String uri) { - final Namespace element = MAP.get(uri); - return element == null ? UNKNOWN : element; + public static Namespace forUri(String uri) + { + final Namespace element = MAP.get(uri); + return element == null ? UNKNOWN : element; } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -41,7 +41,7 @@ */ class SharedPortletTldsMetaDataBuilder { - private static final String [] PORTLET_TLDS = {"portlet.tld", "portlet_2_0.tld"}; + private static final String[] PORTLET_TLDS = {"portlet.tld", "portlet_2_0.tld"}; private final List<TldMetaData> tlds = new ArrayList<TldMetaData>(); @@ -50,44 +50,61 @@ init(); } - private void init() { - try { - ModuleClassLoader jstl = Module.getModuleFromCallerModuleLoader(ModuleIdentifier.create("org.gatein.pc")).getClassLoader(); - for (String tld: PORTLET_TLDS) { - InputStream is = jstl.getResourceAsStream("META-INF/" + tld); - if (is != null) { - TldMetaData tldMetaData = parseTLD(tld, is); - tlds.add(tldMetaData); - } - } - } catch (ModuleLoadException e) { - // Ignore - } catch (Exception e) { - // Ignore - } + private void init() + { + try + { + ModuleClassLoader jstl = Module.getModuleFromCallerModuleLoader(ModuleIdentifier.create("org.gatein.pc")).getClassLoader(); + for (String tld : PORTLET_TLDS) + { + InputStream is = jstl.getResourceAsStream("META-INF/" + tld); + if (is != null) + { + TldMetaData tldMetaData = parseTLD(tld, is); + tlds.add(tldMetaData); + } + } + } + catch (ModuleLoadException e) + { + // Ignore + } + catch (Exception e) + { + // Ignore + } } - List<TldMetaData> create() { - final List<TldMetaData> metadata = new ArrayList<TldMetaData>(); - metadata.addAll(tlds); - return metadata; + List<TldMetaData> create() + { + final List<TldMetaData> metadata = new ArrayList<TldMetaData>(); + metadata.addAll(tlds); + return metadata; } - private TldMetaData parseTLD(String tld, InputStream is) throws Exception { - try { - final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - inputFactory.setXMLResolver(NoopXmlResolver.create()); - XMLStreamReader xmlReader = inputFactory.createXMLStreamReader(is); - return TldMetaDataParser.parse(xmlReader); - } finally { - try { - if (is != null) { - is.close(); - } - } catch (IOException e) { - // Ignore - } - } + private TldMetaData parseTLD(String tld, InputStream is) throws Exception + { + try + { + final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + inputFactory.setXMLResolver(NoopXmlResolver.create()); + XMLStreamReader xmlReader = inputFactory.createXMLStreamReader(is); + return TldMetaDataParser.parse(xmlReader); + } + finally + { + try + { + if (is != null) + { + is.close(); + } + } + catch (IOException e) + { + // Ignore + } + } } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -40,7 +40,8 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class PortletWarClassloadingDependencyProcessor implements DeploymentUnitProcessor { +public class PortletWarClassloadingDependencyProcessor implements DeploymentUnitProcessor +{ private static final ModuleIdentifier GATEIN_WCI = ModuleIdentifier.create("org.gatein.wci"); private static final ModuleIdentifier GATEIN_PC = ModuleIdentifier.create("org.gatein.pc"); @@ -54,10 +55,12 @@ } @Override - public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { + public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException + { final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); - if (deploymentUnit.getAttachment(PortletWarKey.INSTANCE) == null) { - return; // Skip non portlet deployments + if (deploymentUnit.getAttachment(PortletWarKey.INSTANCE) == null) + { + return; // Skip non portlet deployments } final ModuleLoader moduleLoader = Module.getBootModuleLoader(); @@ -76,19 +79,24 @@ { TldsMetaData tsmd = deploymentUnit.getAttachment(TldsMetaData.ATTACHMENT_KEY); if (tsmd == null) + { throw new IllegalStateException("Attachment not present: TldsMetaData"); + } - Map<String,TldMetaData> tlds = tsmd.getTlds(); + Map<String, TldMetaData> tlds = tsmd.getTlds(); if (tlds == null) + { throw new IllegalStateException("TldsMetaData.tlds == null"); + } - for (TldMetaData tld: tldMetas) + for (TldMetaData tld : tldMetas) { tlds.put(tld.getUri(), tld); } } @Override - public void undeploy(DeploymentUnit context) { + public void undeploy(DeploymentUnit context) + { } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -38,25 +38,30 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class PortletWarDeploymentInitializingProcessor implements DeploymentUnitProcessor { +public class PortletWarDeploymentInitializingProcessor implements DeploymentUnitProcessor +{ private static final String PORTLET_XML = "WEB-INF/portlet.xml"; @Override - public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { - final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); - if (!DeploymentTypeMarker.isType(DeploymentType.WAR, deploymentUnit)) { - return; // Skip non web deployments - } - final ResourceRoot deploymentRoot = deploymentUnit.getAttachment(Attachments.DEPLOYMENT_ROOT); - final VirtualFile portletXml = deploymentRoot.getRoot().getChild(PORTLET_XML); - if (portletXml.exists()) { - // we don't care about the contents, its existence is enough to mark it as a portlet app - deploymentUnit.putAttachment(PortletWarKey.INSTANCE, Boolean.TRUE); - } + public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException + { + final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); + if (!DeploymentTypeMarker.isType(DeploymentType.WAR, deploymentUnit)) + { + return; // Skip non web deployments + } + final ResourceRoot deploymentRoot = deploymentUnit.getAttachment(Attachments.DEPLOYMENT_ROOT); + final VirtualFile portletXml = deploymentRoot.getRoot().getChild(PORTLET_XML); + if (portletXml.exists()) + { + // we don't care about the contents, its existence is enough to mark it as a portlet app + deploymentUnit.putAttachment(PortletWarKey.INSTANCE, Boolean.TRUE); + } } @Override - public void undeploy(DeploymentUnit context) { + public void undeploy(DeploymentUnit context) + { } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -26,7 +26,8 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class PortletWarKey { +public class PortletWarKey +{ public static final AttachmentKey<Boolean> INSTANCE = AttachmentKey.create(Boolean.class);

13 years, 6 months

1
0
0 / 0

gatein SVN: r6778 - in sandbox/as7_support: pc and 7 other directories.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-06-30 06:52:00 -0400 (Thu, 30 Jun 2011) New Revision: 6778 Modified: sandbox/as7_support/README.txt sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java sandbox/as7_support/pc/jboss-as7-integration/pkg/pom.xml sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml sandbox/as7_support/pc/jboss-as7-integration/pom.xml sandbox/as7_support/pc/pom.xml sandbox/as7_support/wci/jboss/jboss7/pom.xml Log: Upgraded to jbossas-7.0.0.CR1 Modified: sandbox/as7_support/README.txt =================================================================== --- sandbox/as7_support/README.txt 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/README.txt 2011-06-30 10:52:00 UTC (rev 6778) @@ -21,11 +21,11 @@ cd jboss-as7-integration mvn install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=SERVERS_DIR -(the previous command automatically downloads jboss-7.0.0.Beta3 build and unpacks it into SERVERS_DIR. If you already have this JBoss AS7 build in SERVERS_DIR you can omit 'download' profile) +(the previous command automatically downloads jboss-7.0.0.CR1 build and unpacks it into SERVERS_DIR. If you already have this JBoss AS7 build in SERVERS_DIR you can omit 'download' profile) cp pkg cd target -cd jboss-7.0.0.Beta3 +cd jboss-7.0.0.CR1 cd bin ./standalone.sh (or just 'standalone' on Windows) Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-06-30 10:52:00 UTC (rev 6778) @@ -25,7 +25,7 @@ import org.jboss.as.controller.ExtensionContext; import org.jboss.as.controller.SubsystemRegistration; import org.jboss.as.controller.parsing.ExtensionParsingContext; -import org.jboss.as.controller.registry.ModelNodeRegistration; +import org.jboss.as.controller.registry.ManagementResourceRegistration; import org.jboss.as.controller.registry.OperationEntry; import org.jboss.logging.Logger; @@ -46,7 +46,7 @@ public void initialize(ExtensionContext context) { log.debugf("Activating GateIn Extension"); final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME); - final ModelNodeRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDescriptionProviders.SUBSYSTEM); + final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDescriptionProviders.SUBSYSTEM); registration.registerOperationHandler(ADD, GateInSubsystemAdd.INSTANCE, GateInSubsystemAdd.INSTANCE, false); registration.registerOperationHandler(DESCRIBE, GateInSubsystemDescribe.INSTANCE, GateInSubsystemDescribe.INSTANCE, false, OperationEntry.EntryType.PRIVATE); subsystem.registerXMLElementWriter(GateInSubsystemParser.getInstance()); Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-06-30 10:52:00 UTC (rev 6778) @@ -23,30 +23,24 @@ import org.gatein.integration.jboss.as7.deployment.PortletWarClassloadingDependencyProcessor; import org.gatein.integration.jboss.as7.deployment.PortletWarDeploymentInitializingProcessor; -import org.jboss.as.controller.BasicOperationResult; -import org.jboss.as.controller.ModelAddOperationHandler; +import org.jboss.as.controller.AbstractBoottimeAddStepHandler; import org.jboss.as.controller.OperationContext; import org.jboss.as.controller.OperationFailedException; -import org.jboss.as.controller.OperationResult; -import org.jboss.as.controller.ResultHandler; -import org.jboss.as.controller.RuntimeTask; -import org.jboss.as.controller.RuntimeTaskContext; +import org.jboss.as.controller.ServiceVerificationHandler; import org.jboss.as.controller.descriptions.DescriptionProvider; -import org.jboss.as.server.BootOperationContext; -import org.jboss.as.server.BootOperationHandler; +import org.jboss.as.server.AbstractDeploymentChainStep; +import org.jboss.as.server.DeploymentProcessorTarget; import org.jboss.as.server.deployment.Phase; import org.jboss.dmr.ModelNode; +import org.jboss.msc.service.ServiceController; +import java.util.List; import java.util.Locale; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE; - /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemAdd implements ModelAddOperationHandler, BootOperationHandler, DescriptionProvider { +public class GateInSubsystemAdd extends AbstractBoottimeAddStepHandler implements DescriptionProvider { static final GateInSubsystemAdd INSTANCE = new GateInSubsystemAdd(); static final int STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT = 0x0B80; @@ -56,36 +50,39 @@ } - public ModelNode getModelDescription(Locale locale) { - return GateInSubsystemDescriptions.getSubsystemDescription(locale); + protected void populateModel(ModelNode operation, ModelNode model) { + ModelNode ourContainerConfig = new ModelNode(); + model.get(Constants.CONTAINER_CONFIG).set(ourContainerConfig); } - public OperationResult execute(final OperationContext updateContext, final ModelNode operation, final ResultHandler resultHandler) throws OperationFailedException { - final ModelNode config = operation.get(Constants.CONTAINER_CONFIG); + protected void performBoottime(OperationContext context, ModelNode operation, ModelNode model, + ServiceVerificationHandler verificationHandler, + List<ServiceController<?>> newControllers) throws OperationFailedException { + final ModelNode config = operation.get(Constants.CONTAINER_CONFIG); + context.addStep(new AbstractDeploymentChainStep() { + protected void execute(DeploymentProcessorTarget processorTarget) { + final SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); - final ModelNode subModel = updateContext.getSubModel(); - subModel.get(Constants.CONTAINER_CONFIG).set(config); + processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); + processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, + new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); + } + }, OperationContext.Stage.RUNTIME); +/* + final WebServerService service = new WebServerService(defaultVirtualServer, useNative); + newControllers.add(context.getServiceTarget().addService(WebSubsystemServices.JBOSS_WEB, service) + .addDependency(AbstractPathService.pathNameOf(TEMP_DIR), String.class, service.getPathInjector()) + .addDependency(DependencyType.OPTIONAL, ServiceName.JBOSS.append("mbean", "server"), MBeanServer.class, service.getMbeanServer()) + .setInitialMode(Mode.ON_DEMAND) + .install()); +*/ + } - if (updateContext instanceof BootOperationContext) { - final BootOperationContext ctx = (BootOperationContext) updateContext; - updateContext.getRuntimeContext().setRuntimeTask(new RuntimeTask() { - public void execute(RuntimeTaskContext context) throws OperationFailedException { + protected boolean requiresRuntimeVerification() { + return false; + } - SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); - - ctx.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); - ctx.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, - new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); - resultHandler.handleResultComplete(); - } - }); - } else { - resultHandler.handleResultComplete(); - } - - final ModelNode compensatingOperation = new ModelNode(); - compensatingOperation.get(OP).set(REMOVE); - compensatingOperation.get(OP_ADDR).set(operation.require(OP_ADDR)); - return new BasicOperationResult(compensatingOperation); + public ModelNode getModelDescription(Locale locale) { + return GateInSubsystemDescriptions.getSubsystemDescription(locale); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-06-30 10:52:00 UTC (rev 6778) @@ -21,12 +21,10 @@ */ package org.gatein.integration.jboss.as7; -import org.jboss.as.controller.BasicOperationResult; -import org.jboss.as.controller.ModelQueryOperationHandler; import org.jboss.as.controller.OperationContext; -import org.jboss.as.controller.OperationResult; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.controller.OperationStepHandler; import org.jboss.as.controller.PathAddress; -import org.jboss.as.controller.ResultHandler; import org.jboss.as.controller.descriptions.DescriptionProvider; import org.jboss.as.controller.operations.common.Util; import org.jboss.dmr.ModelNode; @@ -40,16 +38,17 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemDescribe implements ModelQueryOperationHandler, DescriptionProvider { +public class GateInSubsystemDescribe implements OperationStepHandler, DescriptionProvider { static final GateInSubsystemDescribe INSTANCE = new GateInSubsystemDescribe(); /** {@inheritDoc} */ @Override - public OperationResult execute(final OperationContext context, final ModelNode operation, final ResultHandler resultHandler) { + public void execute(OperationContext context, ModelNode operation) throws OperationFailedException + { final ModelNode result = new ModelNode(); final PathAddress rootAddress = PathAddress.pathAddress(PathAddress.pathAddress(operation.require(OP_ADDR)).getLastElement()); - final ModelNode subModel = context.getSubModel(); + final ModelNode subModel = context.readModel(PathAddress.EMPTY_ADDRESS); final ModelNode subsystemAdd = new ModelNode(); subsystemAdd.get(OP).set(ADD); @@ -58,10 +57,7 @@ subsystemAdd.get(Constants.CONTAINER_CONFIG).set(subModel.get(Constants.CONTAINER_CONFIG)); } result.add(subsystemAdd); - - resultHandler.handleResultFragment(Util.NO_LOCATION, result); - resultHandler.handleResultComplete(); - return new BasicOperationResult(); + context.completeStep(); } @Override Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-06-30 10:52:00 UTC (rev 6778) @@ -34,7 +34,6 @@ import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoader; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -65,9 +64,9 @@ final ModuleSpecification moduleSpecification = deploymentUnit.getAttachment(Attachments.MODULE_SPECIFICATION); // Add module dependencies - moduleSpecification.addDependency(new ModuleDependency(moduleLoader, GATEIN_WCI, false, false, false)); - moduleSpecification.addDependency(new ModuleDependency(moduleLoader, GATEIN_PC, false, false, false)); - moduleSpecification.addDependency(new ModuleDependency(moduleLoader, JAVAX_PORTLET, false, false, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, GATEIN_WCI, false, false, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, GATEIN_PC, false, false, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, JAVAX_PORTLET, false, false, false)); // Provide tlds for portlet taglibs provideTlds(deploymentUnit); Modified: sandbox/as7_support/pc/jboss-as7-integration/pkg/pom.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/pkg/pom.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/pkg/pom.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -17,7 +17,7 @@ <name>GateIn - Portlet Container (JBoss AS7 Integration Packaging - SimplePortal)</name> <properties> - <jbossas.version>7.0.0.Beta3</jbossas.version> + <jbossas.version>7.0.0.CR1</jbossas.version> <jbossas.dist.version>${jbossas.version}</jbossas.dist.version> <servers.dir>${project.basedir}/servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> @@ -139,7 +139,7 @@ </activation> <properties> - <exo.projects.app.jboss7.version>jboss-7.0.0.Beta3</exo.projects.app.jboss7.version> + <exo.projects.app.jboss7.version>jboss-7.0.0.CR1</exo.projects.app.jboss7.version> <servers.dir>${exo.projects.directory.dependencies}</servers.dir> <jbossas.name>${exo.projects.app.jboss7.version}</jbossas.name> </properties> @@ -281,7 +281,7 @@ <ant antfile="${project.basedir}/download-jboss.xml"> <target name="download-jboss"/> <property name="url" - value="https://repository.jboss.org/nexus/content/groups/public-jboss/org/jboss/..."/> + value="http://download.jboss.org/jbossas/7.0/jboss-${jbossas.dist.version}/jboss..."/> <property name="dest" value="${jbossas.zip}"/> </ant> Modified: sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -25,9 +25,9 @@ <module xmlns="urn:jboss:module:1.0" name="org.jboss.as.web"> <resources> - <resource-root path="jboss-as-web-7.0.0.Beta3.jar"/> + <resource-root path="jboss-as-web-7.0.0.CR1.jar"/> <resource-root path="jasper-jdt-7.0.0.Beta8.jar"/> - <resource-root path="jbossweb-7.0.0.Beta11.jar"/> + <resource-root path="jbossweb-7.0.0.CR4.jar"/>  </resources> @@ -40,10 +40,14 @@ <module name="javax.servlet.jsp.api"/> <module name="org.jboss.jandex"/> <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.clustering.web.spi" optional="true"/> <module name="org.jboss.as.controller"/> <module name="org.jboss.as.ee"/> <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.network"/> + <module name="org.jboss.as.security"/> <module name="org.jboss.as.server"/> + <module name="org.jboss.as.threads"/> <module name="org.jboss.invocation"/> <module name="org.jboss.metadata"/> <module name="org.jboss.modules"/> @@ -55,4 +59,4 @@ <module name="org.picketbox"/> <module name="org.gatein.wci"/> </dependencies> -</module> +</module> \ No newline at end of file Modified: sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -1,8 +1,29 @@ -<?xml version='1.0' encoding='UTF-8'?> + -<server name="example" xmlns="urn:jboss:domain:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:domain:1.0 jboss_7_0.xsd urn:jboss:domain:arquillian:1.0 jboss-arquillian.xsd urn:jboss:domain:connector:1.0 jboss-connector.xsd urn:jboss:domain:datasources:1.0 jboss-datasources.xsd urn:jboss:domain:ejb3:1.0 jboss-ejb3.xsd urn:jboss:domain:ee:1.0 jboss-ee.xsd urn:jboss:domain:jaxrs:1.0 jboss-jaxrs.xsd urn:jboss:domain:jmx:1.0 jboss-jmx.xsd urn:jboss:domain:jpa:1.0 jboss-jpa.xsd urn:jboss:domain:messaging:1.0 jboss-messaging.xsd urn:jboss:domain:naming:1.0 jboss-naming.xsd urn:jboss:domain:osgi:1.0 jboss-osgi.xsd urn:jboss:domain:remoting:1.0 jboss-remoting.xsd urn:jboss:domain:resourceadapters:1.0 jboss-resource-adapters.xsd urn:jboss:domain:sar:1.0 jboss-sar.xsd urn:jboss:domain:threads:1.0 jboss-threads.xsd urn:jboss:domain:transactions:1.0 jboss-txn.xsd urn:jboss:domain:web:1.0 jboss-web.xsd urn:jboss:domain:deployment-scanner:1.0 jbos! s-deployment-scanner.xsd urn:jboss:domain:security:1.0 jboss-security.xsd urn:jboss:domain:webservices:1.0 jboss-webservices.xsd urn:jboss:domain:weld:1.0 jboss-weld.xsd urn:jboss:domain:gatein:1.0 jboss-gatein.xsd"> +<server xmlns="urn:jboss:domain:1.0"> + <extensions> - <extension module="org.jboss.as.arquillian.service"/> + <extension module="org.jboss.as.clustering.infinispan"/> <extension module="org.jboss.as.connector"/> <extension module="org.jboss.as.deployment-scanner"/> <extension module="org.jboss.as.ee"/> @@ -11,7 +32,6 @@ <extension module="org.jboss.as.jmx"/> <extension module="org.jboss.as.jpa"/> <extension module="org.jboss.as.logging"/> - <extension module="org.jboss.as.messaging"/> <extension module="org.jboss.as.naming"/> <extension module="org.jboss.as.osgi"/> <extension module="org.jboss.as.remoting"/> @@ -19,28 +39,35 @@ <extension module="org.jboss.as.security"/> <extension module="org.jboss.as.threads"/> <extension module="org.jboss.as.transactions"/> - <extension module="org.jboss.as.web"/> - <extension module="org.jboss.as.webservices"/> - <extension module="org.jboss.as.weld"/> + <extension module="org.jboss.as.web" /> + <extension module="org.jboss.as.weld" /> <extension module="org.gatein"/> </extensions> - <paths> - <path name="absolute" path="tmp"/> - <path name="relative" path="relative" relative-to="absolute"/> - </paths> - <management-interfaces> - <native-interface interface="default" port="9999"/> - <http-interface interface="default" port="9990"/> - </management-interfaces> - <profile name="undefined"> + + <management> + <security-realms> + <security-realm name="PropertiesMgmtSecurityRealm"> + <authentication> + <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" /> + </authentication> + </security-realm> + </security-realms> + <management-interfaces> + <native-interface interface="management" port="9999" /> + <http-interface interface="management" port="9990"/> + </management-interfaces> + </management> + + <profile> <subsystem xmlns="urn:jboss:domain:logging:1.0"> - <console-handler name="CONSOLE" autoflush="true"> + <console-handler name="CONSOLE"> <level name="INFO"/> <formatter> <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> </formatter> </console-handler> - <periodic-rotating-file-handler name="FILE" autoflush="true"> + + <periodic-rotating-file-handler name="FILE"> <level name="INFO"/> <formatter> <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> @@ -48,6 +75,7 @@ <file relative-to="jboss.server.log.dir" path="server.log"/> <suffix value=".yyyy-MM-dd"/> </periodic-rotating-file-handler> + <logger category="com.arjuna"> <level name="WARN"/> </logger> @@ -57,6 +85,7 @@ <logger category="sun.rmi"> <level name="WARN"/> </logger> + <root-logger> <level name="INFO"/> <handlers> @@ -65,282 +94,186 @@ </handlers> </root-logger> </subsystem> - <subsystem xmlns="urn:jboss:domain:threads:1.0"> - <bounded-queue-thread-pool name="jca-short-running" blocking="true" allow-core-timeout="false"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="SECONDS"/> - </bounded-queue-thread-pool> - <bounded-queue-thread-pool name="jca-long-running" blocking="true" allow-core-timeout="false"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="SECONDS"/> - </bounded-queue-thread-pool> - <bounded-queue-thread-pool name="ejb3-async" blocking="true" allow-core-timeout="false"> - <core-threads count="10" per-cpu="20"/> - <queue-length count="10" per-cpu="20"/> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="SECONDS"/> - </bounded-queue-thread-pool> - <scheduled-thread-pool name="remoting"> - <max-threads count="10" per-cpu="20"/> - <keepalive-time time="10" unit="SECONDS"/> - </scheduled-thread-pool> - </subsystem> - <subsystem xmlns="urn:jboss:domain:arquillian:1.0"/> - <subsystem xmlns="urn:jboss:domain:ee:1.0"/> - <subsystem xmlns="urn:jboss:domain:ejb3:1.0"/> - <subsystem xmlns="urn:jboss:domain:naming:1.0"/> - <subsystem xmlns="urn:jboss:domain:security:1.0"> - <security-domains> - <security-domain name="other"> - <authentication> - <login-module code="UsersRoles" flag="required"/> - </authentication> - </security-domain> - </security-domains> - </subsystem> - <subsystem xmlns="urn:jboss:domain:remoting:1.0" thread-pool="remoting"/> - <subsystem xmlns="urn:jboss:domain:jmx:1.0"> - <jmx-connector server-binding="jmx-connector-server" registry-binding="jmx-connector-registry"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> - <subsystem xmlns="urn:jboss:domain:jpa:1.0"/> - <subsystem xmlns="urn:jboss:domain:sar:1.0"/> - <subsystem xmlns="urn:jboss:domain:transactions:1.0"> - <core-environment socket-binding="txn-socket-process-id"/> - <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> - <coordinator-environment/> - <object-store/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:connector:1.0"> - <archive-validation enabled="false"/> - <bean-validation enabled="false"/> - <default-workmanager short-running-thread-pool="jca-short-running" long-running-thread-pool="jca-long-running"/> - </subsystem> <subsystem xmlns="urn:jboss:domain:datasources:1.0"> <datasources> - <datasource jndi-name="java:/H2DS" pool-name="H2DS" enabled="true" use-java-context="true"> - <connection-url> - jdbc:h2:mem:test;DB_CLOSE_DELAY=-1 - </connection-url> - <driver-class> - org.h2.Driver - </driver-class> - <driver> - org.h2.Driver#1.2 - </driver> - <pool> - <prefill> - true - </prefill> - <use-strict-min> - false - </use-strict-min> - </pool> + <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="H2DS"> + <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> + <driver>h2</driver> + <pool></pool> <security> - <user-name> - sa - </user-name> - <password> - sa - </password> + <user-name>sa</user-name> + <password>sa</password> </security> - <validation> - <validate-on-match> - false - </validate-on-match> - <background-validation> - false - </background-validation> - <useFastFail> - false - </useFastFail> - </validation> - <statement/> + <validation></validation> + <timeout></timeout> + <statement></statement> </datasource> + <drivers> + <driver name="h2" module="com.h2database.h2"> + <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> + </driver> + </drivers> </datasources> - <drivers> - <driver module="com.h2database.h2"/> - </drivers> </subsystem> - <subsystem xmlns="urn:jboss:domain:resourceadapters:1.0"/> + <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0"> + <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments" /> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0" /> + <subsystem xmlns="urn:jboss:domain:ejb3:1.0" /> + <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate"> + <cache-container name="hibernate" default-cache="local-query"> + <local-cache name="entity"> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </local-cache> + <local-cache name="local-query"> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </local-cache> + <local-cache name="timestamps"> + <eviction strategy="NONE"/> + </local-cache> + </cache-container> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> + <subsystem xmlns="urn:jboss:domain:jca:1.0"> + <archive-validation enabled="false" /> + <bean-validation enabled="false" /> + <default-workmanager> + <short-running-threads blocking="true"> + <core-threads count="10" per-cpu="20"/> + <queue-length count="10" per-cpu="20"/> + <max-threads count="10" per-cpu="20"/> + <keepalive-time time="10" unit="seconds"/> + </short-running-threads> + <long-running-threads blocking="true"> + <core-threads count="10" per-cpu="20"/> + <queue-length count="10" per-cpu="20"/> + <max-threads count="10" per-cpu="20"/> + <keepalive-time time="10" unit="seconds"/> + </long-running-threads> + </default-workmanager> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jmx:1.0"> + <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" /> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jpa:1.0"> + <jpa default-datasource=""/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:naming:1.0" /> <subsystem xmlns="urn:jboss:domain:osgi:1.0" activation="lazy"> <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager"> - <property name="manager.root"> - jboss-osgi - </property> + <property name="manager.root">jboss-osgi</property> </configuration> <properties> +  <property name="org.jboss.osgi.system.modules"> - org.apache.log4j, - org.jboss.as.osgi, + org.apache.commons.logging, + org.apache.log4j, + org.jboss.as.osgi, + org.slf4j, </property> +  <property name="org.osgi.framework.system.packages.extra"> - org.apache.log4j;version=1.2, - org.jboss.as.osgi.service;version=7.0, - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.util;version=1.0, - org.jboss.osgi.testing;version=1.0, + org.apache.commons.logging;version=1.1.1, + org.apache.log4j;version=1.2, + org.jboss.as.osgi.service;version=7.0, + org.jboss.osgi.deployment.interceptor;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.testing;version=1.0, + org.jboss.osgi.vfs;version=1.0, + org.slf4j;version=1.5.10, </property> +  + <property name="org.osgi.framework.startlevel.beginning">1</property> </properties> <modules> - <module identifier="org.jboss.as.arquillian.aggregate"/> +  + <module identifier="javaee.api"/> <module identifier="org.jboss.logging"/> - <module identifier="org.apache.aries.jmx" start="true"/> +  <module identifier="org.apache.aries.util"/> - <module identifier="org.apache.felix.configadmin" start="true"/> - <module identifier="org.jboss.as.osgi.configadmin" start="true"/> - <module identifier="org.jboss.osgi.common" start="true"/> - <module identifier="org.jboss.osgi.jmx" start="true"/> + <module identifier="org.jboss.osgi.webconsole"/> <module identifier="org.osgi.compendium"/> +  + <module identifier="org.apache.felix.log" startlevel="1"/> + <module identifier="org.jboss.osgi.logging" startlevel="1"/> + <module identifier="org.apache.felix.configadmin" startlevel="1"/> + <module identifier="org.jboss.as.osgi.configadmin" startlevel="1"/> +  + <module identifier="org.apache.aries.jmx" startlevel="2"/> + <module identifier="org.apache.felix.eventadmin" startlevel="2"/> + <module identifier="org.apache.felix.metatype" startlevel="2"/> + <module identifier="org.apache.felix.webconsole" startlevel="2"/> + <module identifier="org.jboss.osgi.jmx" startlevel="2"/> + <module identifier="org.jboss.osgi.http" startlevel="2"/> +  + <module identifier="org.jboss.osgi.blueprint" startlevel="3"/> + <module identifier="org.jboss.osgi.webapp" startlevel="3"/> + <module identifier="org.jboss.osgi.xerces" startlevel="3"/> </modules> </subsystem> - <subsystem xmlns="urn:jboss:domain:messaging:1.0"> - <acceptors> - <in-vm-acceptor name="in-vm" server-id="0"/> - <netty-acceptor name="netty" socket-binding="messaging"/> - <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput"> - <param key="batch-delay" value="50"/> - <param key="direct-deliver" value="false"/> - </netty-acceptor> - </acceptors> - <address-settings> - <address-setting match="#"> - <dead-letter-address> - jms.queue.DLQ - </dead-letter-address> - <expiry-address> - jms.queue.ExpiryQueue - </expiry-address> - <redelivery-delay> - 0 - </redelivery-delay> - <max-size-bytes> - 10485760 - </max-size-bytes> - <message-counter-history-day-limit> - 10 - </message-counter-history-day-limit> - <address-full-policy> - BLOCK - </address-full-policy> - </address-setting> - </address-settings> - <connectors> - <in-vm-connector name="in-vm" server-id="0"/> - <netty-connector name="netty" socket-binding="messaging"/> - <netty-connector name="netty-throughput" socket-binding="messaging-throughput"> - <param key="batch-delay" value="50"/> - </netty-connector> - </connectors> - <journal-min-files> - 2 - </journal-min-files> - <journal-type> - NIO - </journal-type> - <journal-file-size> - 102400 - </journal-file-size> - <persistence-enabled> - false - </persistence-enabled> - <security-settings> - <security-setting match="#"> - <permission type="send" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - </security-setting> - </security-settings> + <subsystem xmlns="urn:jboss:domain:remoting:1.0"/> + <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" /> + <subsystem xmlns="urn:jboss:domain:sar:1.0"/> + <subsystem xmlns="urn:jboss:domain:security:1.0"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + </security-domains> </subsystem> - <subsystem xmlns="urn:jboss:domain:messaging:jms:1.0"> - <connection-factory name="InVmConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm" backup-connector-name="netty"/> - </connectors> - <entries> - <entry name="java:/ConnectionFactory"/> - </entries> - </connection-factory> - <connection-factory name="RemoteConnectionFactory"> - <connectors> - <connector-ref connector-name="netty" backup-connector-name="in-vm"/> - </connectors> - <entries> - <entry name="RemoteConnectionFactory"/> - </entries> - </connection-factory> - <queue name="testQueue"> - <entry name="queue/test"/> - </queue> - <topic name="testTopic"> - <entry name="topic/test"/> - </topic> + <subsystem xmlns="urn:jboss:domain:threads:1.0"/> + <subsystem xmlns="urn:jboss:domain:transactions:1.0"> + <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> + <core-environment> + <process-id> + <uuid /> + </process-id> + </core-environment> + <coordinator-environment default-timeout="300"/> </subsystem> <subsystem xmlns="urn:jboss:domain:web:1.0"> - <connector name="http" protocol="HTTP/1.1" socket-binding="http" scheme="http"/> - <virtual-server name="localhost"> - <alias name="example.com"/> + <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/> + <virtual-server name="localhost" enable-welcome-root="true"> + <alias name="example.com" /> </virtual-server> </subsystem> - <subsystem xmlns="urn:jboss:domain:weld:1.0"/> - <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0"> - <deployment-scanner name="default" path="deployments" scan-interval="5000" relative-to="jboss.server.base.dir"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:webservices:1.0"> - <configuration> - <webServiceHost> - localhost - </webServiceHost> - <modifySOAPAddress> - true - </modifySOAPAddress> - </configuration> - </subsystem> + <subsystem xmlns="urn:jboss:domain:weld:1.0" /> + <subsystem xmlns="urn:jboss:domain:gatein:1.0"/> </profile> + <interfaces> - <interface name="default"> + <interface name="management"> <inet-address value="127.0.0.1"/> </interface> - <interface name="any"> - <any-address/> + <interface name="public"> + <inet-address value="127.0.0.1"/> </interface> - <interface name="complex"> - <any> - <subnet-match value="192.168.0.0/16"/> - <public-address/> - </any> - <not> - <site-local-address/> - </not> - <up/> - <multicast/> - </interface> </interfaces> - <socket-binding-group name="standard-sockets" default-interface="default"> - <socket-binding name="jndi" port="1099"/> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="http" port="8080"/> + <socket-binding name="https" port="8443"/> <socket-binding name="jmx-connector-registry" port="1090"/> <socket-binding name="jmx-connector-server" port="1091"/> - <socket-binding name="http" port="8080"/> - <socket-binding name="https" port="8447"/> + <socket-binding name="jndi" port="1099"/> <socket-binding name="osgi-http" port="8090"/> <socket-binding name="remoting" port="4447"/> <socket-binding name="txn-recovery-environment" port="4712"/> <socket-binding name="txn-status-manager" port="4713"/> - <socket-binding name="txn-socket-process-id" port="4714"/> - <socket-binding name="messaging" port="5445"/> - <socket-binding name="messaging-throughput" port="5455"/> </socket-binding-group> - <system-properties> - <property name="foo" value="bar"/> - <property name="key" value="value"/> - </system-properties> - <deployments> - <deployment name="simple-portal.ear" runtime-name="simple-portal.ear" sha1="1682d34c7e562db7d6ad53624f9e41fbb0398e13"/> - </deployments> -</server> \ No newline at end of file + +</server> Modified: sandbox/as7_support/pc/jboss-as7-integration/pom.xml =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/pom.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/jboss-as7-integration/pom.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -16,8 +16,8 @@ <name>GateIn - Portlet Container (JBoss AS7 Integration)</name> <properties> - <version.jboss.as>7.0.0.Beta3</version.jboss.as> - <jboss.as.release.version>7.0.0.Beta3</jboss.as.release.version> + <version.jboss.as>7.0.0.CR1</version.jboss.as> + <jboss.as.release.version>7.0.0.CR1</jboss.as.release.version> <version.org.jboss.vfs>3.0.0.GA</version.org.jboss.vfs> </properties> Modified: sandbox/as7_support/pc/pom.xml =================================================================== --- sandbox/as7_support/pc/pom.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/pc/pom.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -47,7 +47,7 @@ <properties> <version.gatein.common>2.0.4-Beta03</version.gatein.common> - <version.gatein.wci>2.1.0-Beta03-SNAPSHOT</version.gatein.wci> + <version.gatein.wci>2.1.0-Beta05-SNAPSHOT</version.gatein.wci> <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> <version.apache.taglibs>1.1.2</version.apache.taglibs> <version.apache.log4j>1.2.14</version.apache.log4j> Modified: sandbox/as7_support/wci/jboss/jboss7/pom.xml =================================================================== --- sandbox/as7_support/wci/jboss/jboss7/pom.xml 2011-06-30 08:07:05 UTC (rev 6777) +++ sandbox/as7_support/wci/jboss/jboss7/pom.xml 2011-06-30 10:52:00 UTC (rev 6778) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-jboss</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss7</artifactId>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6777 - in portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US: modules/portal and 1 other directory.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2011-06-30 04:07:05 -0400 (Thu, 30 Jun 2011) New Revision: 6777 Modified: portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/images/EditPortal2.6New.png portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/images/PortalSetting2.5.png portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/images/Skin1.png portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/modules/portal/Manage_Portals.xml Log: GTNPORTAL-1907 Update User guide for site describability Modified: portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/images/EditPortal2.6New.png =================================================================== (Binary files differ) Modified: portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/images/PortalSetting2.5.png =================================================================== (Binary files differ) Modified: portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/images/Skin1.png =================================================================== (Binary files differ) Modified: portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/modules/portal/Manage_Portals.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/modules/portal/Manage_Portals.xml 2011-06-30 02:16:49 UTC (rev 6776) +++ portal/branches/branch-GTNPORTAL-1921/docs/user-guide/en-US/modules/portal/Manage_Portals.xml 2011-06-30 08:07:05 UTC (rev 6777) @@ -205,7 +205,7 @@ <section id="proc-User_Guide-Manage_Portals-Edit_Properties"> <title>Edit Properties</title> <para> - Portal properties such as language, skin and permissions can be set by clicking on <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis>Edit Portal Properties</emphasis> link for the portal you wish to edit: + Portal properties such as language, description, label, skin and permissions can be set by clicking on <emphasis role="bold">Site</emphasis> in the <emphasis role="bold">Toolbar</emphasis> and selecting the <emphasis>Edit Portal Properties</emphasis> link for the portal you wish to edit: </para> <mediaobject> <imageobject role="html"> @@ -330,7 +330,7 @@ </step> <step> <para> - Click <emphasis role="bold">Save</emphasis> then <emphasis role="bold">Finish</emphasis>. + Click <emphasis role="bold">Save</emphasis> to finish your change. </para> </step> </procedure>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6776 - portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-06-29 22:16:49 -0400 (Wed, 29 Jun 2011) New Revision: 6776 Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java Log: Add missing case in reflection code of TestSkinService Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-06-29 10:23:05 UTC (rev 6775) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-06-30 02:16:49 UTC (rev 6776) @@ -28,6 +28,7 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.net.URL; import java.util.Collection; import java.util.HashMap; @@ -206,7 +207,14 @@ try { - method.invoke(skinService, arguments); + if(Modifier.isStatic(method.getModifiers())) + { + method.invoke(null, arguments); + } + else + { + method.invoke(skinService, arguments); + } } catch(Exception ex) {

13 years, 6 months

1
0
0 / 0

gatein SVN: r6775 - in portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test: resources/mockwebapp and 4 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-06-29 06:23:05 -0400 (Wed, 29 Jun 2011) New Revision: 6775 Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portal/ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portlet/ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css Log: Update JUnit tests for SkinService Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java (rev 0) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceRenderer.java 2011-06-29 10:23:05 UTC (rev 6775) @@ -0,0 +1,73 @@ +/* + * 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.resource; + +import org.exoplatform.commons.utils.BinaryOutput; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.Charset; + +/** + * A simple ResourceRenderer used in JUnit tests of SkinService + * + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 6/29/11 + */ +public class MockResourceRenderer implements ResourceRenderer +{ + + private final BinaryOutput output; + + private final static Charset UTF_8 = Charset.forName("UTF-8"); + + public MockResourceRenderer(final OutputStream out) + { + this.output = new BinaryOutput() + { + public Charset getCharset() + { + return UTF_8; + } + + public void write(byte b) throws IOException + { + out.write(b); + } + + public void write(byte[] bytes) throws IOException + { + out.write(bytes); + } + + public void write(byte[] bytes, int off, int len) throws IOException + { + out.write(bytes, off, len); + } + }; + } + + public BinaryOutput getOutput() throws IOException + { + return output; + } + + public void setExpiration(long seconds) + { + } +} Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java 2011-06-29 05:50:58 UTC (rev 6774) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java 2011-06-29 10:23:05 UTC (rev 6775) @@ -47,7 +47,7 @@ public String getContextPath() { - return contextName; + return "/" + contextName; } public ServletContext getContext(String s) @@ -77,12 +77,12 @@ public URL getResource(String s) throws MalformedURLException { - return loader.getResource(s); + return loader.getResource(contextName + s); } public InputStream getResourceAsStream(String s) { - return loader.getResourceAsStream(s); + return loader.getResourceAsStream(contextName + s); } public RequestDispatcher getRequestDispatcher(String s) Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-06-29 05:50:58 UTC (rev 6774) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-06-29 10:23:05 UTC (rev 6775) @@ -25,9 +25,13 @@ import org.exoplatform.component.test.ContainerScope; import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.resource.config.xml.SkinConfigParser; +import java.io.ByteArrayOutputStream; import java.io.InputStream; +import java.lang.reflect.Method; import java.net.URL; import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import javax.servlet.ServletContext; /** @@ -49,6 +53,9 @@ private volatile boolean initSkinService = true; + /** A cache of Method in SkinService, served for reflect invocation **/ + private Map<String, Method> methodsOfSkinService = new HashMap<String, Method>(); + @Override protected void setUp() throws Exception { @@ -61,7 +68,7 @@ mockServletContext = new MockServletContext("mockwebapp", portalContainer.getPortalClassLoader()); skinService.registerContext(mockServletContext); - processSkinConfiguration("mockwebapp/gatein-resources.xml"); + processSkinConfiguration("/gatein-resources.xml"); } } @@ -111,7 +118,7 @@ SkinConfig firstPortletSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin"); assertNotNull(firstPortletSkin); - assertEquals(mockServletContext.getContextPath() + "/skin/FirstPortlet/Stylesheet.css", firstPortletSkin.getCSSPath()); + assertEquals(mockServletContext.getContextPath() + "/skin/portlet/FirstPortlet/Stylesheet.css", firstPortletSkin.getCSSPath()); } public void testDeployedThemes() @@ -119,16 +126,94 @@ } - public void testRenderCSS() + public void testRenderLT_CSS() throws Exception { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ResourceRenderer renderer = new MockResourceRenderer(out); + skinService.renderCSS(renderer, "/mockwebapp/skin/Stylesheet-lt.css"); + + //TODO: Check the array of bytes in out } - public void testRenderCSSConcurrently() + public void testRenderRT_CSS() throws Exception { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ResourceRenderer renderer = new MockResourceRenderer(out); + skinService.renderCSS(renderer, "/mockwebapp/skin/Stylesheet-rt.css"); + + //TODO: Check the array of bytes in out } + public void testBackground() throws Exception + { + } + + public void testServiceCache() throws Exception + { + } + + public void testSkinPriority() throws Exception + { + } + + public void testUndeploySkinConfig() throws Exception + { + //TODO: Fork the work of GateInSkinConfigRemoval here + } + + /** + * Designed to invoke reflectively private methods of SkinService. That facilitate + * writting JUnit tests + * + * @param methodName + * @param arguments + */ + private void invokeMethodOfSkinService(String methodName, Object... arguments) + { + StringBuilder methodSignature = new StringBuilder(methodName); + Class<?>[] paramTypes = new Class<?>[arguments.length]; + for(int i =0; i < arguments.length; i++) + { + paramTypes[i] = arguments[i].getClass(); + methodSignature.append("_"); + methodSignature.append(paramTypes[i].getName()); + } + //First we look at the cache + Method method = methodsOfSkinService.get(methodSignature.toString()); + + //Find method by reflection + if(method == null) + { + try + { + method = skinService.getClass().getDeclaredMethod(methodName, paramTypes); + if(method != null) + { + method.setAccessible(true); + methodsOfSkinService.put(methodSignature.toString(), method); + } + else + { + return; + } + } + catch (NoSuchMethodException ex) + { + } + } + + try + { + method.invoke(skinService, arguments); + } + catch(Exception ex) + { + ex.printStackTrace(); + } + } + @Override protected void tearDown() throws Exception { Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java 2011-06-29 05:50:58 UTC (rev 6774) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java 2011-06-29 10:23:05 UTC (rev 6775) @@ -62,6 +62,7 @@ public void testFirstCSSFile() throws IOException { initiateReader("skin/test_1.css"); + skipCommentReader.setCommentBlockHandler(new CommentBlockHandler.OrientationCommentBlockHandler()); for(int i =0; i < 30; i++) { Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-06-29 05:50:58 UTC (rev 6774) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-06-29 10:23:05 UTC (rev 6775) @@ -33,7 +33,7 @@ <application-name>mockwebapp</application-name> <portlet-name>FirstPortlet</portlet-name> <skin-name>TestSkin</skin-name> - <css-path>/skin/FirstPortlet/Stylesheet.css</css-path> + <css-path>/skin/portlet/FirstPortlet/Stylesheet.css</css-path> </portlet-skin>  Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css 2011-06-29 05:50:58 UTC (rev 6774) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css 2011-06-29 10:23:05 UTC (rev 6775) @@ -16,7 +16,15 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -@import url(DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css); -@import url(DefaultSkin/webui/component/Stylesheet.css); -@import url(PortletThemes/Stylesheet.css); -@import url(Portlet/Stylesheet.css); +.LeftBlock { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} +/* blah blah */ +aaaaaa +@import url(portal/TestSkin/Stylesheet.css); /* blah blah */ +bbbbbb +.RightBlock { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ +} \ No newline at end of file Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css (rev 0) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/Stylesheet.css 2011-06-29 10:23:05 UTC (rev 6775) @@ -0,0 +1,21 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +.LeftBlock { + float: left; /* orientation=lt */ float: right; /* orientation=rt */ +} \ No newline at end of file Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css (rev 0) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/portlet/Stylesheet.css 2011-06-29 10:23:05 UTC (rev 6775) @@ -0,0 +1,27 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +.LeftBlock { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ +} +/* blah blah */ +.RightBlock { + float: right; /* orientation=lt */ + float: left; /* orientation=rt */ +} \ No newline at end of file

13 years, 6 months

1
0
0 / 0

gatein SVN: r6774 - in portal/branches/branch-GTNPORTAL-1921/component/web/resources/src: test/java/org/exoplatform/portal/resource and 1 other directory.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-06-29 01:50:58 -0400 (Wed, 29 Jun 2011) New Revision: 6774 Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkipCommentReader.java portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java Log: GTNPORTAL-1943: Update SkipCommentReader and JUnit tests Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkipCommentReader.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkipCommentReader.java 2011-06-29 04:55:29 UTC (rev 6773) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkipCommentReader.java 2011-06-29 05:50:58 UTC (rev 6774) @@ -190,9 +190,7 @@ nextChar = readSingleCharacter(); } - String line = builder.toString().trim(); - - return line; + return builder.toString().trim(); } /** Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java 2011-06-29 04:55:29 UTC (rev 6773) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkipCommentReader.java 2011-06-29 05:50:58 UTC (rev 6774) @@ -127,7 +127,49 @@ line = skipCommentReader.readLine(); assertEquals("4.abcdefghijklmn", line); + } + public void testNumberOfCommingEscapes() throws IOException + { + String COMMENT_BLOCK = "/*COMMENT BLOCK*/"; + StringBuilder builder = new StringBuilder(); + builder.append(COMMENT_BLOCK).append("1.abcdefghijklmn\n"); + builder.append("2.abcdefghijklmn\n"); + builder.append("3.").append(COMMENT_BLOCK).append("abcdefghijklmn\n"); + + Reader reader = new StringReader(builder.toString()); + initiateReader(reader); + + skipCommentReader.setNumberOfCommingEscapes(COMMENT_BLOCK.length()); + String firstLine = skipCommentReader.readLine(); + assertEquals(COMMENT_BLOCK + "1.abcdefghijklmn", firstLine); + + String secondLine = skipCommentReader.readLine(); + assertEquals("2.abcdefghijklmn", secondLine); + + skipCommentReader.setNumberOfCommingEscapes(2 + COMMENT_BLOCK.length()); + String thirdLine = skipCommentReader.readLine(); + assertEquals("3." + COMMENT_BLOCK + "abcdefghijklmn", thirdLine); } + + public void testCursorState() throws IOException + { + Reader reader = new StringReader("0123456//*xxxx*/*789"); + initiateReader(reader); + + assertEquals(SkipCommentReader.State.ENCOUNTING_ORDINARY_CHARACTER, skipCommentReader.getCursorState()); + for(int i = 0; i < 7; i++) + + { + int readChar = skipCommentReader.readSingleCharacter(); + assertEquals(SkipCommentReader.State.ENCOUNTING_ORDINARY_CHARACTER, skipCommentReader.getCursorState()); + } + + skipCommentReader.readSingleCharacter(); + assertEquals(SkipCommentReader.State.ENCOUNTING_FORWARD_SLASH, skipCommentReader.getCursorState()); + + skipCommentReader.readSingleCharacter();//The comment block is automatically skipped + assertEquals(SkipCommentReader.State.ENCOUNTING_ASTERIK, skipCommentReader.getCursorState()); + } }

13 years, 6 months

1
0
0 / 0

gatein SVN: r6773 - in portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test: resources and 3 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-06-29 00:55:29 -0400 (Wed, 29 Jun 2011) New Revision: 6773 Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/conf/skin-service-configuration.xml portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css Log: Add first JUnit tests to SkinService Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java (rev 0) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockServletContext.java 2011-06-29 04:55:29 UTC (rev 6773) @@ -0,0 +1,167 @@ +/* + * 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.resource; + +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Enumeration; +import java.util.Set; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 6/29/11 + */ +public class MockServletContext implements ServletContext +{ + + private String contextName; + + private ClassLoader loader; + + public MockServletContext(String contextName, ClassLoader loader) + { + this.contextName = contextName; + this.loader = loader; + } + + public String getContextPath() + { + return contextName; + } + + public ServletContext getContext(String s) + { + return null; + } + + public int getMajorVersion() + { + return 0; + } + + public int getMinorVersion() + { + return 0; + } + + public String getMimeType(String s) + { + return null; + } + + public Set getResourcePaths(String s) + { + return null; + } + + public URL getResource(String s) throws MalformedURLException + { + return loader.getResource(s); + } + + public InputStream getResourceAsStream(String s) + { + return loader.getResourceAsStream(s); + } + + public RequestDispatcher getRequestDispatcher(String s) + { + return null; + } + + public RequestDispatcher getNamedDispatcher(String s) + { + return null; + } + + public Servlet getServlet(String s) throws ServletException + { + return null; + } + + public Enumeration getServlets() + { + return null; + } + + public Enumeration getServletNames() + { + return null; + } + + public void log(String s) + { + } + + public void log(Exception e, String s) + { + } + + public void log(String s, Throwable throwable) + { + } + + public String getRealPath(String s) + { + return null; + } + + public String getServerInfo() + { + return null; + } + + public String getInitParameter(String s) + { + return null; + } + + public Enumeration getInitParameterNames() + { + return null; + } + + public Object getAttribute(String s) + { + return null; + } + + public Enumeration getAttributeNames() + { + return null; + } + + public void setAttribute(String s, Object o) + { + } + + public void removeAttribute(String s) + { + } + + public String getServletContextName() + { + return contextName; + } +} Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java (rev 0) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-06-29 04:55:29 UTC (rev 6773) @@ -0,0 +1,136 @@ +/* + * 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.resource; + +import org.exoplatform.commons.xml.DocumentSource; +import org.exoplatform.component.test.AbstractKernelTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; +import org.exoplatform.container.PortalContainer; +import org.exoplatform.portal.resource.config.xml.SkinConfigParser; +import java.io.InputStream; +import java.net.URL; +import java.util.Collection; +import javax.servlet.ServletContext; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 6/29/11 + */ +@ConfiguredBy( + { + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") + } +) +public class TestSkinService extends AbstractKernelTest +{ + private PortalContainer portalContainer; + + private SkinService skinService; + + private ServletContext mockServletContext; + + private volatile boolean initSkinService = true; + + @Override + protected void setUp() throws Exception + { + if(initSkinService) + { + initSkinService = false; + + portalContainer = getContainer(); + skinService = (SkinService)portalContainer.getComponentInstanceOfType(SkinService.class); + mockServletContext = new MockServletContext("mockwebapp", portalContainer.getPortalClassLoader()); + skinService.registerContext(mockServletContext); + + processSkinConfiguration("mockwebapp/gatein-resources.xml"); + } + } + + private void processSkinConfiguration(String configResource) throws Exception + { + URL url = mockServletContext.getResource(configResource); + SkinConfigParser.processConfigResource(DocumentSource.create(url), skinService, mockServletContext); + } + + public void testInitService() + { + assertNotNull(portalContainer); + assertEquals("portal", portalContainer.getName()); + assertNotNull(skinService); + } + + public void testInitSkinModules() + { + assertNotNull(skinService.getAvailableSkinNames()); + assertTrue(skinService.getAvailableSkinNames().contains("TestSkin")); + } + + public void testInitThemes() + { + + } + + public void testDeployedSkinModules() + { + assertNotNull(skinService.getAvailableSkinNames()); + assertTrue(skinService.getAvailableSkinNames().contains("TestSkin")); + + Collection<SkinConfig> skinConfigs = skinService.getPortalSkins("TestSkin"); + assertNotNull(skinConfigs); + + SkinConfig portalSkin = null; + for(SkinConfig config : skinConfigs) + { + if("TestSkin".equals(config.getName())) + { + portalSkin = config; + break; + } + } + assertNotNull(portalSkin); + assertEquals(mockServletContext.getContextPath() + "/skin/Stylesheet.css", portalSkin.getCSSPath()); + + SkinConfig firstPortletSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin"); + assertNotNull(firstPortletSkin); + assertEquals(mockServletContext.getContextPath() + "/skin/FirstPortlet/Stylesheet.css", firstPortletSkin.getCSSPath()); + } + + public void testDeployedThemes() + { + + } + + public void testRenderCSS() + { + + } + + public void testRenderCSSConcurrently() + { + + } + + @Override + protected void tearDown() throws Exception + { + } +} Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/conf/skin-service-configuration.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/conf/skin-service-configuration.xml (rev 0) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/conf/skin-service-configuration.xml 2011-06-29 04:55:29 UTC (rev 6773) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <key>org.exoplatform.portal.resource.compressor.ResourceCompressor</key> + <type>org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService</type> + <component-plugins> + <component-plugin> + <name>MockCompressorPlugin</name> + <set-method>registerCompressorPlugin</set-method> + <type>org.exoplatform.portal.resource.compressor.MockCompressorPlugin</type> + <init-params> + <value-param> + <name>plugin.priority</name> + <value>5</value> + </value-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>JSMinCompressorPlugin</name> + <set-method>registerCompressorPlugin</set-method> + <type>org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin</type> + <init-params> + <value-param> + <name>plugin.priority</name> + <value>9</value> + </value-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>YUICSSCompressorPlugin</name> + <set-method>registerCompressorPlugin</set-method> + <type>org.exoplatform.portal.resource.compressor.css.YUICSSCompressorPlugin</type> + <init-params> + <value-param> + <name>plugin.priority</name> + <value>1</value> + </value-param> + <value-param> + <name>line.break.position</name> + <value>100</value> + </value-param> + </init-params> + </component-plugin> + </component-plugins> + </component> + + <component> + <key>org.exoplatform.portal.resource.SkinService</key> + <type>org.exoplatform.portal.resource.SkinService</type> + </component> +</configuration> Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml (rev 0) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-06-29 04:55:29 UTC (rev 6773) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<gatein-resources + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + + <portal-skin> + <skin-name>TestSkin</skin-name> + <css-path>/skin/Stylesheet.css</css-path> + </portal-skin> + + <portlet-skin> + <application-name>mockwebapp</application-name> + <portlet-name>FirstPortlet</portlet-name> + <skin-name>TestSkin</skin-name> + <css-path>/skin/FirstPortlet/Stylesheet.css</css-path> + </portlet-skin> + +  + <window-style> + <style-name>Simple</style-name> + <style-theme> + <theme-name>SimpleBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>SimplePink</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>RoundConer</style-name> + <style-theme> + <theme-name>RoundConerBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerPink</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>Shadow</style-name> + <style-theme> + <theme-name>ShadowBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowPink</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>MacStyle</style-name> + <style-theme> + <theme-name>MacTheme</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGray</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGreenSteel</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>VistaStyle</style-name> + <style-theme> + <theme-name>VistaTheme</theme-name> + </style-theme> + </window-style> + +</gatein-resources> Added: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css (rev 0) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/test/resources/mockwebapp/skin/Stylesheet.css 2011-06-29 04:55:29 UTC (rev 6773) @@ -0,0 +1,22 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +@import url(DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css); +@import url(DefaultSkin/webui/component/Stylesheet.css); +@import url(PortletThemes/Stylesheet.css); +@import url(Portlet/Stylesheet.css);

13 years, 6 months

1
0
0 / 0

gatein SVN: r6772 - portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-06-28 21:43:50 -0400 (Tue, 28 Jun 2011) New Revision: 6772 Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkipCommentReader.java Log: GTNPORTAL-1943: Remove redundant field Modified: portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkipCommentReader.java =================================================================== --- portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkipCommentReader.java 2011-06-29 01:35:38 UTC (rev 6771) +++ portal/branches/branch-GTNPORTAL-1921/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkipCommentReader.java 2011-06-29 01:43:50 UTC (rev 6772) @@ -32,8 +32,6 @@ public class SkipCommentReader extends BufferedReader { - private BufferedReader bufferedReader; - private final StringBuilder pushbackCache; private final static int EOF = -1;

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits June 2011