gatein SVN: r5833 - in portal/branches/shindig2/packaging: jboss-as6/pkg and 1 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2011-02-01 09:33:50 -0500 (Tue, 01 Feb 2011)
New Revision: 5833
Modified:
portal/branches/shindig2/packaging/jboss-as5/pkg/pom.xml
portal/branches/shindig2/packaging/jboss-as6/pkg/pom.xml
portal/branches/shindig2/packaging/jetty/pkg/pom.xml
Log:
add shindig2 packaging for jetty & jbossas
Modified: portal/branches/shindig2/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/branches/shindig2/packaging/jboss-as5/pkg/pom.xml 2011-02-01 14:19:49 UTC (rev 5832)
+++ portal/branches/shindig2/packaging/jboss-as5/pkg/pom.xml 2011-02-01 14:33:50 UTC (rev 5833)
@@ -363,19 +363,19 @@
<!-- GateIn Shinding -->
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
</dependency>
@@ -543,6 +543,18 @@
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>1.0</version>
@@ -596,8 +608,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/branches/shindig2/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/branches/shindig2/packaging/jboss-as6/pkg/pom.xml 2011-02-01 14:19:49 UTC (rev 5832)
+++ portal/branches/shindig2/packaging/jboss-as6/pkg/pom.xml 2011-02-01 14:33:50 UTC (rev 5833)
@@ -363,19 +363,19 @@
<!-- GateIn Shinding -->
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
</dependency>
@@ -536,6 +536,18 @@
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>1.0</version>
@@ -589,8 +601,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/branches/shindig2/packaging/jetty/pkg/pom.xml
===================================================================
--- portal/branches/shindig2/packaging/jetty/pkg/pom.xml 2011-02-01 14:19:49 UTC (rev 5832)
+++ portal/branches/shindig2/packaging/jetty/pkg/pom.xml 2011-02-01 14:33:50 UTC (rev 5833)
@@ -378,19 +378,19 @@
<!-- GateIn Shinding -->
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
</dependency>
@@ -558,6 +558,18 @@
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6rc1</version>
@@ -616,8 +628,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
13 years, 3 months
- 1
- 0
gatein SVN: r5832 - in portal/trunk/packaging/jboss-as5: pkg and 1 other directory.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-02-01 09:19:49 -0500 (Tue, 01 Feb 2011)
New Revision: 5832
Modified:
portal/trunk/packaging/jboss-as5/README.txt
portal/trunk/packaging/jboss-as5/pkg/pom.xml
Log:
GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager
- Fixed WCI merged overwrites in jboss-as5
Modified: portal/trunk/packaging/jboss-as5/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as5/README.txt 2011-02-01 13:20:11 UTC (rev 5831)
+++ portal/trunk/packaging/jboss-as5/README.txt 2011-02-01 14:19:49 UTC (rev 5832)
@@ -16,6 +16,7 @@
+
== Usage ==
@@ -25,14 +26,10 @@
Then go to packaging/jboss-as5 to perform packaging.
-There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Ppack), and bundling as a zip (-Pbundle).
+There are three profiles that cover dependency download (-Pdownload), packaging as exploded (default), and bundling as a zip (-Pbundle).
-For main build use either 'download' or 'pack' profile, but not both, as 'download' also includes 'pack' functionality.
-Both of these profiles also automatically perform 'clean' to assure consistent results.
+For main build use either 'download' profile or no profile (default). Both of these automatically perform 'clean' to ensure consistent results.
-Profile 'pack' is the one active by default. When activating any other profile, the 'pack' profile is automatically turned off, so
- it may have to be explicitly activated again if packaging is required (i.e. -Ppack,bundle).
-
There are two system properties that control where the root directory for JBoss AS servers is located, and what specific JBoss AS directory to use.
They are preset to default location:
@@ -46,16 +43,17 @@
-== Examples ==
+== Some examples ==
+
1) The simplest form uses default location for JBoss AS
mvn
This is equivalent to:
-mvn clean package -Ppack -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-5.1.0.GA
+mvn clean package -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-5.1.0.GA
2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly
@@ -67,11 +65,11 @@
mvn -Pdownload
-If SERVERS_DIR is not at default location explicitly set it:
+If SERVERS_DIR is not at default location, explicitly set it:
mvn -Pdownload -Dservers.dir=SERVERS_DIR
-You shouldn't set jbossas.name property when using -Pdownload.
+There's no need to set 'jbossas.name' property when using -Pdownload (if set, its value should be 'jboss-5.1.0.GA').
4) Zip bundle may be produced by activating 'bundle' profile
@@ -80,8 +78,72 @@
or
-mvn -Ppack,bundle
+mvn -Pbundle
-or just
-mvn -Pbundle
+
+
+
+== Compatibility with previous packaging (PKG) ==
+
+
+The previous packaging uses two different properties to specify 'servers.dir' and 'jbossas.name':
+
+ - exo.projects.directory.dependencies (equivalent to 'servers.dir')
+ - exo.projects.app.jboss5.version (equivalent to 'jbossas.name')
+
+
+Compatibility mode can be activated by using -Ppkg-jbossas5.
+
+
+
+
+
+== Build integration ==
+
+
+Packaging can be run separately from portal build as described before:
+
+# build portal first
+cd $GATEIN/portal/trunk
+mvn clean install -DskipTests
+
+# then package
+cd packaging/jboss-as5
+mvn
+
+
+Or it can be run together with the portal build, by using -Ppkg-jbossas5 compatibility mode:
+
+# build and package all at once
+cd $GATEIN/portal/trunk
+mvn clean install -Ppkg-jbossas5,download -DskipTests -Dexo.projects.directory.dependencies=$GATEIN/portal/trunk/packaging/servers
+
+(Notice how we also activate 'download' profile in this example - that's ideal for a new user who's building GateIn for the first time)
+
+
+
+
+
+== Troubleshoot ==
+
+
+1) 'Checksum validation failed!'
+
+When using -Pdownload it may happen that the download is interrupted, and the resulting file corrupt.
+The solution is to manually delete the target file from the filesystem, and run 'mvn -Pdownload' again.
+
+2) 'DIRECTORY does not exist.' when using -Pdownload.
+
+When using -Pdownload, and specifying -Djbossas.name=NAME at the same time (something you're adviced not to practice),
+the download part of the build will completely ignore 'jbossas.name' property, but the packaging part will use it, and look for
+JBoss AS instance in the specified directory.
+The solution is to not specify -Djbossas.name=NAME at all, or to set its value to 'jboss-5.1.0.GA'.
+
+3) 'Destination JBossAS directory exists already: DIRECTORY'
+
+When using -Pdownload the downloaded JBoss AS distribution is unpacked into a local directory. If the directory exists already
+the build will abort, to avoid corrupting a possibly carefully prepared specially configured JBoss AS instance.
+One solution is to not use -Pdownload in this case since the appropriate JBoss AS is already present. Or, you can move the
+directory out of the way, or delete it.
+
Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-02-01 13:20:11 UTC (rev 5831)
+++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-02-01 14:19:49 UTC (rev 5832)
@@ -17,11 +17,13 @@
<name>GateIn for JBoss AS 5.x.x packaging</name>
<properties>
+ <!-- The following two properties should not be changed! -->
<jbossas.version>5.1.0.GA</jbossas.version>
<jbossas.dist.version>5.1.0.GA-jdk6</jbossas.dist.version>
- <servers.dir>${exo.projects.directory.dependencies}</servers.dir>
+
+ <servers.dir>${project.basedir}/../../servers</servers.dir>
<jbossas.path>${servers.dir}</jbossas.path>
- <jbossas.name>${exo.projects.app.jboss5.version}</jbossas.name>
+ <jbossas.name>jboss-${jbossas.version}</jbossas.name>
<jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir>
<jbossas.target.dir>${project.build.directory}/jboss</jbossas.target.dir>
</properties>
@@ -909,112 +911,168 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>check-jboss-environment-ready</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>jbossas.path</property>
+ <message>"
+You must define the property 'jbossas.path'
+to give the path to the directory where you store your applications servers.
+"
+ </message>
+ </requireProperty>
+ <requireProperty>
+ <property>jbossas.name</property>
+ <message>"
+You must define the property 'jbossas.name'
+to give the name of the directory where JBoss AS is stored.
+"
+ </message>
+ </requireProperty>
+ <requireFilesExist>
+ <files>
+ <file>${jbossas.path}/${jbossas.name}/</file>
+ </files>
+ <message>"
+The following JBoss AS directory doesn't exist :
+ ${jbossas.path}/${jbossas.name}
+Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location of servers directory
+and/or -Djbossas.name=NAME to point to the correct directory under the servers directory.
+You can also use -Pdownload to automatically provide JBoss AS instance.
+"
+ </message>
+ </requireFilesExist>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <executions>
+ <execution>
+ <id>auto-clean</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>prepare-package</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <ant antfile="${project.basedir}/package.xml" inheritRefs="true">
+ <target name="package"/>
+ <property name="maven.project.basedir" value="${project.basedir}"/>
+ <property name="maven.project.build.directory" value="${project.build.directory}"/>
+ </ant>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
<profiles>
<profile>
- <id>download</id>
+ <id>pkg-jbossas5</id>
+
+ <properties>
+ <exo.projects.app.jboss5.version>jboss-5.1.0.GA</exo.projects.app.jboss5.version>
+ <servers.dir>${exo.projects.directory.dependencies}</servers.dir>
+ <jbossas.name>${exo.projects.app.jboss5.version}</jbossas.name>
+ </properties>
+
<build>
<plugins>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <id>auto-clean</id>
- <phase>initialize</phase>
+ <id>check-jboss-legacy-environment-dependencies-dir</id>
<goals>
- <goal>clean</goal>
+ <goal>enforce</goal>
</goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>exo.projects.directory.dependencies</property>
+ <message>"
+You must define the property 'exo.projects.directory.dependencies'
+to specify the path to the directory where you store your application servers.
+"
+ </message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
<execution>
- <id>prepare-package</id>
- <phase>prepare-package</phase>
+ <id>check-jboss-legacy-environment-jboss-name</id>
<goals>
- <goal>run</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
- <target>
- <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip"/>
-
- <!-- Autocreate servers.dir if necessary -->
- <mkdir dir="${jbossas.path}"/>
-
- <!-- Download JBossAS unless already downloaded -->
- <ant antfile="${project.basedir}/download-jboss.xml">
- <target name="download-jboss"/>
- <property name="url"
- value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/>
- <property name="dest" value="${jbossas.zip}"/>
- </ant>
-
- <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/>
-
- <fail message="Destination JBossAS directory exists already: ${jbossas.dir} (Won't overwrite!)"
- if="jbossas.dir.exists"/>
-
- <!-- Extract downloaded JBossAS to servers dir -->
- <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/>
-
- <ant antfile="${project.basedir}/package.xml" inheritRefs="true">
- <target name="package"/>
- <property name="maven.project.basedir" value="${project.basedir}"/>
- <property name="maven.project.build.directory" value="${project.build.directory}"/>
- </ant>
- </target>
+ <rules>
+ <requireProperty>
+ <property>exo.projects.app.jboss5.version</property>
+ <message>"
+You must define the property 'exo.projects.app.jboss5.version'
+to specify the name of the directory where JBoss AS is stored.
+"
+ </message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
</configuration>
</execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>pack</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
<execution>
- <id>jboss-check-environment-ready</id>
+ <id>check-jboss-dir-exists</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
- <requireProperty>
- <property>jbossas.path</property>
- <message>"You must define the property jbossas.path to give the path to the directory
- where you store your applications servers"
- </message>
- </requireProperty>
- <requireProperty>
- <property>jbossas.name</property>
- <message>"You must define the property jbossas.name to give the name of the directory
- where JBoss AS is stored"
- </message>
- </requireProperty>
<requireFilesExist>
<files>
- <file>${jbossas.path}/${jbossas.name}/</file>
+ <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss5.version}/
+ </file>
</files>
- <message>"The following JBoss AS directory doesn't exist :
- ${jbossas.path}/${jbossas.name}
+ <message>"
+The following JBoss AS directory doesn't exist :
+ ${exo.projects.directory.dependencies}/${exo.projects.app.jboss5.version}
-Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location.
+Make JBoss AS instance available at that location, or use -Dexo.projects.directory.dependencies=PATH to point to the correct location
+of servers directory and/or -Dexo.projects.app.jboss5.version=NAME to point to the correct directory under the servers directory.
You can also use -Pdownload to automatically provide JBoss AS instance.
"
</message>
@@ -1023,19 +1081,37 @@
<fail>true</fail>
</configuration>
</execution>
+ <execution>
+ <id>check-jboss-environment-ready</id>
+ <phase>none</phase>
+ </execution>
</executions>
</plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>download</id>
+ <build>
+ <plugins>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <id>auto-clean</id>
- <phase>initialize</phase>
- <goals>
- <goal>clean</goal>
- </goals>
+ <id>check-jboss-environment-ready</id>
+ <phase>none</phase>
</execution>
+ <execution>
+ <id>check-jboss-legacy-environment-jboss-name</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>check-jboss-dir-exists</id>
+ <phase>none</phase>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -1051,6 +1127,32 @@
</goals>
<configuration>
<target>
+ <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/>
+
+ <fail if="jbossas.dir.exists">"
+Destination JBossAS directory exists already:
+ ${jbossas.dir}
+
+Either rename it, delete it, or deactivate -Pdownload profile.
+"
+ </fail>
+
+ <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip"/>
+
+ <!-- Autocreate servers.dir if necessary -->
+ <mkdir dir="${jbossas.path}"/>
+
+ <!-- Download JBossAS unless already downloaded -->
+ <ant antfile="${project.basedir}/download-jboss.xml">
+ <target name="download-jboss"/>
+ <property name="url"
+ value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/>
+ <property name="dest" value="${jbossas.zip}"/>
+ </ant>
+
+ <!-- Extract downloaded JBossAS to servers dir -->
+ <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/>
+
<ant antfile="${project.basedir}/package.xml" inheritRefs="true">
<target name="package"/>
<property name="maven.project.basedir" value="${project.basedir}"/>
@@ -1064,7 +1166,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>bundle</id>
<build>
@@ -1095,4 +1197,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
13 years, 3 months
- 1
- 0
gatein SVN: r5831 - in portal/branches/shindig2: component/application-registry and 10 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2011-02-01 08:20:11 -0500 (Tue, 01 Feb 2011)
New Revision: 5831
Modified:
portal/branches/shindig2/component/application-registry/pom.xml
portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
portal/branches/shindig2/gadgets/core/pom.xml
portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java
portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java
portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java
portal/branches/shindig2/gadgets/eXoGadgets/pom.xml
portal/branches/shindig2/gadgets/server/pom.xml
portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml
portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js
portal/branches/shindig2/packaging/module/src/main/javascript/portal.packaging.module.js
portal/branches/shindig2/packaging/tomcat/pkg/pom.xml
portal/branches/shindig2/pom.xml
portal/branches/shindig2/webui/portal/pom.xml
Log:
change shindig version to 2.0.2
Modified: portal/branches/shindig2/component/application-registry/pom.xml
===================================================================
--- portal/branches/shindig2/component/application-registry/pom.xml 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/component/application-registry/pom.xml 2011-02-01 13:20:11 UTC (rev 5831)
@@ -48,7 +48,7 @@
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
</dependency>
Modified: portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
===================================================================
--- portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2011-02-01 13:20:11 UTC (rev 5831)
@@ -332,6 +332,11 @@
}
return done;
}
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ return null;
+ }
finally
{
chromatticLifeCycle.closeContext(true);
Modified: portal/branches/shindig2/gadgets/core/pom.xml
===================================================================
--- portal/branches/shindig2/gadgets/core/pom.xml 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/gadgets/core/pom.xml 2011-02-01 13:20:11 UTC (rev 5831)
@@ -35,7 +35,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
<version>${org.shindig.version}</version>
<type>jar</type>
@@ -79,15 +79,15 @@
<artifactId>exo.kernel.container</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
</dependency>
<dependency>
Modified: portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java
===================================================================
--- portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-02-01 13:20:11 UTC (rev 5831)
@@ -25,7 +25,7 @@
import com.google.inject.name.Named;
import sun.misc.BASE64Encoder;
-import org.apache.shindig.auth.BlobCrypterSecurityTokenDecoder;
+import org.apache.shindig.auth.BlobCrypterSecurityTokenCodec;
import org.apache.shindig.config.ContainerConfigException;
import org.apache.shindig.expressions.Expressions;
import org.exoplatform.commons.utils.Safe;
@@ -164,7 +164,7 @@
@Override
public Object getProperty(String container, String property)
{
- if (property.equals(BlobCrypterSecurityTokenDecoder.SECURITY_TOKEN_KEY_FILE) && _keyPath != null)
+ if (property.equals(BlobCrypterSecurityTokenCodec.SECURITY_TOKEN_KEY_FILE) && _keyPath != null)
{
return _keyPath;
}
Modified: portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java
===================================================================
--- portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoHttpFetcher.java 2011-02-01 13:20:11 UTC (rev 5831)
@@ -41,6 +41,6 @@
@Inject
public ExoHttpFetcher()
{
- super(DEFAULT_MAX_OBJECT_SIZE, DEFAULT_CONNECT_TIMEOUT_MS);
+ super(DEFAULT_MAX_OBJECT_SIZE, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_CONNECT_TIMEOUT_MS, null);
}
-}
+}
\ No newline at end of file
Modified: portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java
===================================================================
--- portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoModule.java 2011-02-01 13:20:11 UTC (rev 5831)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.gadget.core;
+import com.google.inject.AbstractModule;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.DefaultGuiceModule;
import org.apache.shindig.gadgets.http.HttpFetcher;
@@ -31,15 +32,12 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class ExoModule extends DefaultGuiceModule
+public class ExoModule extends AbstractModule
{
@Override
protected void configure()
{
- //super.configure();
-
- //
bind(ContainerConfig.class).to(ExoContainerConfig.class);
bind(HttpFetcher.class).to(ExoHttpFetcher.class);
}
Modified: portal/branches/shindig2/gadgets/eXoGadgets/pom.xml
===================================================================
--- portal/branches/shindig2/gadgets/eXoGadgets/pom.xml 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/gadgets/eXoGadgets/pom.xml 2011-02-01 13:20:11 UTC (rev 5831)
@@ -49,7 +49,7 @@
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
<scope>provided</scope>
</dependency>
Modified: portal/branches/shindig2/gadgets/server/pom.xml
===================================================================
--- portal/branches/shindig2/gadgets/server/pom.xml 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/gadgets/server/pom.xml 2011-02-01 13:20:11 UTC (rev 5831)
@@ -48,18 +48,18 @@
<dependencies>
<!-- project dependencies -->
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.gatein.shindig</groupId>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -86,8 +86,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -96,6 +96,21 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>provided</scope>
Modified: portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-02-01 13:20:11 UTC (rev 5831)
@@ -55,7 +55,7 @@
<filter-mapping>
<filter-name>authFilter</filter-name>
- <url-pattern>/gadgets/ifr</url-pattern>
+ <url-pattern>/gadgetsifr</url-pattern>
</filter-mapping>
<filter-mapping>
@@ -197,7 +197,7 @@
<servlet-mapping>
<servlet-name>xml-to-html</servlet-name>
- <url-pattern>/gadgets/ifr</url-pattern>
+ <url-pattern>/gadgetsifr</url-pattern>
</servlet-mapping>
<servlet-mapping>
Modified: portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js
===================================================================
--- portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js 2011-02-01 13:20:11 UTC (rev 5831)
@@ -44,7 +44,8 @@
// Container must be an array; this allows multiple containers
// to share configuration.
-{"gadgets.container" : ["default"],
+// TODO: Move out accel container config into a separate accel.js file.
+{"gadgets.container" : ["default", "accel"],
// Set of regular expressions to validate the parent parameter. This is
// necessary to support situations where you want a single container to support
@@ -60,38 +61,45 @@
// DNS domain on which gadgets should render.
"gadgets.lockedDomainSuffix" : "-a.example.com:8080",
+// Origins for CORS requests and/or Referer validation
+// Indicate a set of origins or an entry with * to indicate that all origins are allowed
+"gadgets.parentOrigins" : ["*"],
+
// Various urls generated throughout the code base.
// iframeBaseUri will automatically have the host inserted
// if locked domain is enabled and the implementation supports it.
// query parameters will be added.
"gadgets.iframeBaseUri" : "/eXoGadgetServer/gadgets/ifr",
+"gadgets.uri.iframe.basePath" : "/eXoGadgetServer/gadgets/ifr",
// jsUriTemplate will have %host% and %js% substituted.
// No locked domain special cases, but jsUriTemplate must
// never conflict with a lockedDomainSuffix.
"gadgets.jsUriTemplate" : "http://%host%/eXoGadgetServer/gadgets/js/%js%",
+//New configuration for iframeUri generation:
+"gadgets.uri.iframe.lockedDomainSuffix" : "-a.example.com:8080",
+"gadgets.uri.iframe.unlockedDomain" : "localhost:8080",
+"gadgets.uri.iframe.basePath" : "/eXoGadgetServer/gadgets/ifr",
+
+
// Callback URL. Scheme relative URL for easy switch between https/http.
-"gadgets.oauthGadgetCallbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback",
+"gadgets.uri.oauth.callbackTemplate" : "//%host%/eXoGadgetServer/gadgets/oauthcallback",
// Use an insecure security token by default
"gadgets.securityTokenType" : "secure",
"gadgets.securityTokenKeyFile" : "key.txt",
-"gadgets.signingKeyFile" : "oauthkey.pem",
-"gadgets.signingKeyName" : "mytestkey",
-
-"gadgets.signedFetchDomain" : "eXo",
// Config param to load Opensocial data for social
// preloads in data pipelining. %host% will be
// substituted with the current host.
"gadgets.osDataUri" : "http://%host%/social/rpc",
-// Uncomment these to switch to a secure version
-//
-//"gadgets.securityTokenType" : "secure",
-//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
+"gadgets.signingKeyFile" : "oauthkey.pem",
+"gadgets.signingKeyName" : "mytestkey",
+"gadgets.signedFetchDomain" : "eXo",
+
"gadgets.content-rewrite" : {
"include-urls": ".*",
"exclude-urls": "",
@@ -101,6 +109,19 @@
"concat-url": "/eXoGadgetServer/gadgets/concat?"
},
+// Default Js Uri config: also must be overridden.
+"gadgets.uri.js.host" : "http://localhost:8080/",
+"gadgets.uri.js.path" : "/eXoGadgetServer/gadgets/js",
+
+// Default concat Uri config; used for testing.
+"gadgets.uri.concat.host" : "http://localhost:8080/",
+"gadgets.uri.concat.path" : "/eXoGadgetServer/gadgets/concat",
+"gadgets.uri.concat.js.splitToken" : "false",
+
+// Default proxy Uri config; used for testing.
+"gadgets.uri.proxy.host" : "http://localhost:8080/",
+"gadgets.uri.proxy.path" : "/eXoGadgetServer/gadgets/proxy",
+
// This config data will be passed down to javascript. Please
// configure your object using the feature name rather than
// the javascript name.
@@ -162,7 +183,7 @@
// Specifying a binding to "container.listMethods" instructs osapi to dynamicaly introspect the services
// provided by the container and delay the gadget onLoad handler until that introspection is
// complete.
- // Alternatively a container can directly configure services here rather than having them
+ // Alternatively a container can directly configure services here rather than having them
// introspected. Simply list out the available servies and omit "container.listMethods" to
// avoid the initialization delay caused by gadgets.rpc
// E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
@@ -170,11 +191,11 @@
},
// "osapi" : {
// // The endpoints to query for available JSONRPC/REST services
-// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
+// "endPoints" : [ "http://%host%/social/rpc", "http://%host%/gadgets/api/rpc" ]
// },
"osml": {
// OSML library resource. Can be set to null or the empty string to disable OSML
// for a container.
"library": ""
}
-}}
+}}
\ No newline at end of file
Modified: portal/branches/shindig2/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
--- portal/branches/shindig2/packaging/module/src/main/javascript/portal.packaging.module.js 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/packaging/module/src/main/javascript/portal.packaging.module.js 2011-02-01 13:20:11 UTC (rev 5831)
@@ -225,19 +225,22 @@
module.eXoGadgetServer =
new Project("org.exoplatform.portal", "exo.portal.gadgets-server", "war", module.version).
addDependency(new Project("commons-io", "commons-io", "jar", "1.4")).
- addDependency(new Project("commons-codec", "commons-codec", "jar", "1.3")).
+ addDependency(new Project("commons-codec", "commons-codec", "jar", "1.4")).
addDependency(new Project("net.oauth", "core", "jar", "20080621")).
- addDependency(new Project("com.google.collections", "google-collections", "jar", "1.0-rc2")).
+ addDependency(new Project("com.google.guava", "guava", "jar", "r07")).
addDependency(new Project("com.google.code.guice", "guice", "jar", "2.0")).
addDependency(new Project("com.google.code.guice", "guice-jmx", "jar", "2.0")).
+ addDependency(new Project("com.google.inject.extensions", "guice-multibindings", "jar", "2.0")).
+ addDependency(new Project("org.apache.httpcomponents", "httpclient", "jar", "4.0")).
+ addDependency(new Project("org.apache.httpcomponents", "httpcore", "jar", "4.0.1")).
addDependency(new Project("commons-lang", "commons-lang", "jar", "2.4")).
addDependency(new Project("rome", "rome", "jar", "0.9")).
addDependency(new Project("joda-time", "joda-time", "jar", "1.6")).
addDependency(new Project("org.json", "json", "jar", "20070829")).
- addDependency(new Project("org.gatein.shindig", "shindig-common", "jar", shindigVersion)).
- addDependency(new Project("org.gatein.shindig", "shindig-gadgets", "jar", shindigVersion)).
- addDependency(new Project("org.gatein.shindig", "shindig-features", "jar", shindigVersion)).
- addDependency(new Project("org.gatein.shindig", "shindig-social-api", "jar", shindigVersion)).
+ addDependency(new Project("org.apache.shindig", "shindig-common", "jar", shindigVersion)).
+ addDependency(new Project("org.apache.shindig", "shindig-gadgets", "jar", shindigVersion)).
+ addDependency(new Project("org.apache.shindig", "shindig-features", "jar", shindigVersion)).
+ addDependency(new Project("org.apache.shindig", "shindig-social-api", "jar", shindigVersion)).
addDependency(new Project("jdom", "jdom", "jar", "1.0")).
addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.1")).
addDependency(new Project("commons-collections", "commons-collections", "jar", "3.2.1")).
@@ -247,7 +250,7 @@
addDependency(new Project("net.sourceforge.nekohtml", "nekohtml", "jar", "1.9.9")).
addDependency(new Project("xerces", "xercesImpl", "jar", "2.9.1")).
addDependency(new Project("com.thoughtworks.xstream", "xstream", "jar", "1.3.1")).
- addDependency(new Project("caja", "caja", "jar", "r3375")).
+ addDependency(new Project("caja", "caja", "jar", "r4251")).
addDependency(new Project("caja", "json_simple", "jar", "r1")).
addDependency(new Project("org.apache.sanselan", "sanselan", "jar", "0.97-incubator")).
addDependency(new Project("de.odysseus.juel", "juel-api", "jar", "2.1.2")).
Modified: portal/branches/shindig2/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/branches/shindig2/packaging/tomcat/pkg/pom.xml 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/packaging/tomcat/pkg/pom.xml 2011-02-01 13:20:11 UTC (rev 5831)
@@ -370,19 +370,19 @@
<!-- GateIn Shinding -->
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
</dependency>
@@ -550,6 +550,18 @@
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6rc1</version>
@@ -608,8 +620,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/branches/shindig2/pom.xml
===================================================================
--- portal/branches/shindig2/pom.xml 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/pom.xml 2011-02-01 13:20:11 UTC (rev 5831)
@@ -42,7 +42,7 @@
<org.exoplatform.ws.version>2.1.5-GA</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.12.5-GA</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
- <org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
+ <org.shindig.version>2.0.2</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Alpha02</org.gatein.wci.version>
@@ -964,7 +964,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -1063,7 +1063,7 @@
<dependency>
<groupId>caja</groupId>
<artifactId>caja</artifactId>
- <version>r3375</version>
+ <version>r4251</version>
</dependency>
<dependency>
<groupId>caja</groupId>
@@ -1076,9 +1076,9 @@
<version>20080621</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0-rc2</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r07</version>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
@@ -1091,6 +1091,21 @@
<version>2.0</version>
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
<version>0.9</version>
@@ -1127,33 +1142,33 @@
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
<version>${org.shindig.version}</version>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
<version>${org.shindig.version}</version>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
<version>${org.shindig.version}</version>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
<version>${org.shindig.version}</version>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
<version>${org.shindig.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
<version>${org.shindig.version}</version>
</dependency>
Modified: portal/branches/shindig2/webui/portal/pom.xml
===================================================================
--- portal/branches/shindig2/webui/portal/pom.xml 2011-02-01 12:46:26 UTC (rev 5830)
+++ portal/branches/shindig2/webui/portal/pom.xml 2011-02-01 13:20:11 UTC (rev 5831)
@@ -78,7 +78,7 @@
</dependency>
<dependency>
- <groupId>org.gatein.shindig</groupId>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
<type>jar</type>
</dependency>
13 years, 3 months
- 1
- 0
gatein SVN: r5830 - portal/branches.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2011-02-01 07:46:26 -0500 (Tue, 01 Feb 2011)
New Revision: 5830
Added:
portal/branches/shindig2/
Log:
Creating a branch from /portal/trunk
Copied: portal/branches/shindig2 (from rev 5829, portal/trunk)
13 years, 3 months
- 1
- 0