9:28 a.m.
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>
+<!-- TODO remove START-->
<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>
-
+<!-- remove END -->
</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"?>
-<!--
- User-specific configuration for maven. Includes things that should not
- be distributed with the pom.xml file, such as developer identity, along with
- local settings, like proxy information. The default location for the
- settings file is ~/.m2/settings.xml
--->
-<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">
- <!--proxies>
- <proxy>
- <host>my.proxy.host</host>
- </proxy>
- </proxies-->
-
- <!--pluginGroups>
- <pluginGroup>org.codehaus.mojo</pluginGroup>
- </pluginGroups-->
-<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/...
- <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...
- <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>
-<!-- <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/...
-
<url>http://repository.jboss.org/nexus/content/groups/public</url>
- <mirrorOf>*</mirrorOf>
- </mirror>
- </mirrors>-->
+ <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/...
+ <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.GadgetRegistryService</key>
+
<type>org.exoplatform.application.gadget.jcr.GadgetRegistryServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>gadgets.country</name>
+ <description>US</description>
+ <value>US</value>
+ </value-param>
+
<component>
<key>org.exoplatform.application.gadget.SourceStorage</key>
<type>org.exoplatform.application.gadget.impl.SourceStorageImpl</type>
@@ -58,8 +70,57 @@
</properties-param>
</init-params>
</component>
+-->
+ <component>
+ <key>org.exoplatform.application.gadget.SourceStorage</key>
+ <type>org.exoplatform.application.gadget.impl.SourceStorageImpl</type>
+<!--
+ <init-params>
+ <properties-param>
+ <name>location</name>
+ <description>The location store source of gadgets</description>
+ <property name="repository" value="repository"/>
+ <property name="workspace" value="gadgets"/>
+ <property name="store.path" value="/"/>
+ </properties-param>
+ </init-params>
+-->
+ </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>
+<!--
+ <value>org.exoplatform.application.gadget.impl.NTFolder</value>
+ <value>org.exoplatform.application.gadget.impl.NTFile</value>
+ <value>org.exoplatform.application.gadget.impl.NTResource</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>