Author: jcian
Date: Fri Feb 10 19:33:21 2012
New Revision: 1242896
URL: http://svn.apache.org/viewvc?rev=1242896&view=rev
Log:
SHINDIG-1691: Maven project enhancements to improve embedding and extending
shindig-server - Patch from Ate Douma
Added:
shindig/trunk/java/sample-container/
shindig/trunk/java/sample-container/pom.xml
shindig/trunk/java/sample-container/src/
shindig/trunk/java/sample-container/src/main/
shindig/trunk/java/sample-container/src/main/java/
- copied from r1242888, shindig/trunk/java/server/src/main/java/
shindig/trunk/java/server-dependencies/
shindig/trunk/java/server-dependencies/pom.xml
shindig/trunk/java/server-resources/
shindig/trunk/java/server-resources/pom.xml
shindig/trunk/java/server-resources/src/
shindig/trunk/java/server-resources/src/main/
- copied from r1242888, shindig/trunk/java/server/src/main/
Removed:
shindig/trunk/java/server-resources/src/main/java/
shindig/trunk/java/server/src/main/
Modified:
shindig/trunk/java/server/pom.xml
shindig/trunk/pom.xml
Added: shindig/trunk/java/sample-container/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/sample-container/pom.xml?rev=1242896&view=auto
==============================================================================
--- shindig/trunk/java/sample-container/pom.xml (added)
+++ shindig/trunk/java/sample-container/pom.xml Fri Feb 10 19:33:21 2012
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-project</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>shindig-sample-container</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Shindig Sample Container</name>
+ <description>Default Shindig Sample Container module</description>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/sample-container</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/sample-container</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/java/server</url>
+ </scm>
+
+ <dependencies>
+ <!-- project dependencies -->
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-gadgets</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- external dependencies -->
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Added: shindig/trunk/java/server-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/server-dependencies/pom.xml?rev=1242896&view=auto
==============================================================================
--- shindig/trunk/java/server-dependencies/pom.xml (added)
+++ shindig/trunk/java/server-dependencies/pom.xml Fri Feb 10 19:33:21 2012
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-project</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>shindig-server-dependencies</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Apache Shindig Web App Dependencies</name>
+ <description>Default server war dependencies</description>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/server-dependencies</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/server-dependencies</developerConnection>
+
<url>http://svn.apache.org/viewvc/shindig/trunk/java/server-dependencies</url>
+ </scm>
+
+ <dependencies>
+ <!-- project dependencies -->
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-gadgets</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-features</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-extras</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-sample-container</artifactId>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- external dependencies -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
Added: shindig/trunk/java/server-resources/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/server-resources/pom.xml?rev=1242896&view=auto
==============================================================================
--- shindig/trunk/java/server-resources/pom.xml (added)
+++ shindig/trunk/java/server-resources/pom.xml Fri Feb 10 19:33:21 2012
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-project</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>shindig-server-resources</artifactId>
+ <packaging>war</packaging>
+
+ <name>Apache Shindig Web App Resources</name>
+ <description>Shallow Default server war containing only the configuration
and javascript for the gadget rendering and the social api.</description>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/server-resources</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/server-resources</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/java/server-resources</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>${basedir}/../../content/</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+
<directory>target/maven-shared-archive-resources/META-INF</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </webResources>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <targetPath>containers/default</targetPath>
+ <directory>${basedir}/../../config</directory>
+ <includes>
+ <include>container.js</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>config</targetPath>
+ <directory>${basedir}/../../config</directory>
+ <includes>
+ <include>oauth.json</include>
+ <include>oauth2.json</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/server/pom.xml?rev=1242896&r1=1242895&r2=1242896&view=diff
==============================================================================
--- shindig/trunk/java/server/pom.xml (original)
+++ shindig/trunk/java/server/pom.xml Fri Feb 10 19:33:21 2012
@@ -46,13 +46,6 @@
<configuration>
<webResources>
<resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>${basedir}/../../content/</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
- <resource>
<targetPath>META-INF</targetPath>
<directory>target/maven-shared-archive-resources/META-INF</directory>
<includes>
@@ -77,106 +70,33 @@
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <targetPath>containers/default</targetPath>
- <directory>${basedir}/../../config</directory>
- <includes>
- <include>container.js</include>
- </includes>
- </resource>
- <resource>
- <targetPath>config</targetPath>
- <directory>${basedir}/../../config</directory>
- <includes>
- <include>oauth.json</include>
- <include>oauth2.json</include>
- </includes>
- </resource>
- <resource>
- <directory>conf</directory>
- </resource>
- </resources>
</build>
<dependencies>
- <!-- project dependencies -->
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-common</artifactId>
- <classifier>${shindig.jdk.classifier}</classifier>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-gadgets</artifactId>
- <classifier>${shindig.jdk.classifier}</classifier>
- <version>${project.version}</version>
- </dependency>
+ <!-- war dependencies -->
<dependency>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-social-api</artifactId>
+ <artifactId>shindig-server-dependencies</artifactId>
<classifier>${shindig.jdk.classifier}</classifier>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
+ <!-- war resources -->
<dependency>
<groupId>org.apache.shindig</groupId>
- <artifactId>shindig-features</artifactId>
- <classifier>${shindig.jdk.classifier}</classifier>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-extras</artifactId>
+ <artifactId>shindig-server-resources</artifactId>
<classifier>${shindig.jdk.classifier}</classifier>
<version>${project.version}</version>
+ <type>war</type>
</dependency>
- <!-- external dependencies -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
+ <!-- test dependencies -->
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
- <!-- test -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
Modified: shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1242896&r1=1242895&r2=1242896&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Fri Feb 10 19:33:21 2012
@@ -505,6 +505,9 @@
<module>java/common</module>
<module>java/gadgets</module>
<module>java/social-api</module>
+ <module>java/sample-container</module>
+ <module>java/server-resources</module>
+ <module>java/server-dependencies</module>
<module>java/server</module>
<module>extras</module>
</modules>
@@ -603,6 +606,9 @@
<module>java/common</module>
<module>java/gadgets</module>
<module>java/social-api</module>
+ <module>java/sample-container</module>
+ <module>java/server-resources</module>
+ <module>java/server-dependencies</module>
<module>java/server</module>
<module>java/samples</module>
<module>extras</module>
@@ -899,6 +905,9 @@
<module>java/common</module>
<module>java/gadgets</module>
<module>java/social-api</module>
+ <module>java/sample-container</module>
+ <module>java/server-resources</module>
+ <module>java/server-dependencies</module>
<module>java/server</module>
<module>java/samples</module>
<module>java/uber</module>
@@ -995,6 +1004,9 @@
<module>java/common</module>
<module>java/gadgets</module>
<module>java/social-api</module>
+ <module>java/sample-container</module>
+ <module>java/server-resources</module>
+ <module>java/server-dependencies</module>
<module>java/server</module>
<module>extras</module>
<module>assembly</module>
@@ -1505,9 +1517,30 @@
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-sample-container</artifactId>
+ <version>${project.version}</version>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server-resources</artifactId>
+ <version>${project.version}</version>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server-dependencies</artifactId>
+ <version>${project.version}</version>
+ <classifier>${shindig.jdk.classifier}</classifier>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
<version>${project.version}</version>
<classifier>${shindig.jdk.classifier}</classifier>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
