Author: doll
Date: Mon Apr 21 05:42:57 2008
New Revision: 650125
URL: http://svn.apache.org/viewvc?rev=650125&view=rev
Log:
SHINDIG-200 Added a new java module called server. This module runs both the
gadget rendering and social servers which allows the samplecontainer to work
again. Will update the READMEs very shortly
Added:
incubator/shindig/trunk/java/server/
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/java/server/src/
incubator/shindig/trunk/java/server/src/main/
incubator/shindig/trunk/java/server/src/main/webapp/
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
Modified:
incubator/shindig/trunk/etc/set_svn_properties.sh
incubator/shindig/trunk/java/pom.xml
Modified: incubator/shindig/trunk/etc/set_svn_properties.sh
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/etc/set_svn_properties.sh?rev=650125&r1=650124&r2=650125&view=diff
==============================================================================
--- incubator/shindig/trunk/etc/set_svn_properties.sh (original)
+++ incubator/shindig/trunk/etc/set_svn_properties.sh Mon Apr 21 05:42:57 2008
@@ -103,3 +103,4 @@
svn propset svn:ignore -F etc/svn-ignores java/common
svn propset svn:ignore -F etc/svn-ignores java/gadgets
svn propset svn:ignore -F etc/svn-ignores java/social-api
+svn propset svn:ignore -F etc/svn-ignores java/server
Modified: incubator/shindig/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/pom.xml?rev=650125&r1=650124&r2=650125&view=diff
==============================================================================
--- incubator/shindig/trunk/java/pom.xml (original)
+++ incubator/shindig/trunk/java/pom.xml Mon Apr 21 05:42:57 2008
@@ -42,6 +42,7 @@
<module>common</module>
<module>gadgets</module>
<module>social-api</module>
+ <module>server</module>
</modules>
<mailingLists>
Added: incubator/shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=650125&view=auto
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (added)
+++ incubator/shindig/trunk/java/server/pom.xml Mon Apr 21 05:42:57 2008
@@ -0,0 +1,132 @@
+<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <parent>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>server</artifactId>
+ <version>1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>Apache Shindig Java Gadget Server</name>
+ <description>
+ Default server war containing both the Gadget Server and the Social-Api
server.
+ </description>
+ <scm>
+ <connection>
scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/java/server</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java/server</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server</url>
+ </scm>
+ <build>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <outputDirectory>${basedir}/target/classes</outputDirectory>
+ <finalName>shindig</finalName>
+ <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>../../javascript/</directory>
+ <targetPath>/gadgets/files</targetPath>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+
<webAppSourceDirectory>${basedir}/target/shindig</webAppSourceDirectory>
+ <contextPath>/</contextPath>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <targetPath>features</targetPath>
+ <directory>../../features</directory>
+ </resource>
+ <resource>
+ <!-- duplicated here for the jar build. -->
+ <!-- TODO: Eliminate duplicate copies in WAR output -->
+ <!-- this is relative to the pom.xml directory -->
+ <directory>../../javascript/</directory>
+ <targetPath>/gadgets/files</targetPath>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>containers/default</targetPath>
+ <directory>../../config</directory>
+ <includes>
+ <include>container.js</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>config</targetPath>
+ <directory>../../config</directory>
+ <includes>
+ <include>oauth.json</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>conf</directory>
+ </resource>
+ </resources>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>gadgets</artifactId>
+ <version>1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>social-api</artifactId>
+ <version>1-SNAPSHOT</version>
+ </dependency>
+ <!-- Added to prevent a NPE with surefire -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=650125&view=auto
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Mon Apr
21 05:42:57 2008
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+<web-app>
+ <!-- configuration -->
+ <!-- If you have your own Guice module(s), put them here as a
colon-separated list. -->
+ <context-param>
+ <param-name>guice-modules</param-name>
+
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.http.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+ </context-param>
+
+ <listener>
+
<listener-class>org.apache.shindig.gadgets.http.GuiceServletContextListener</listener-class>
+ </listener>
+
+ <!-- Render a Gadget -->
+ <servlet>
+ <servlet-name>xml-to-html</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.http.GadgetRenderingServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Proxy -->
+ <servlet>
+ <servlet-name>proxy</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.http.ProxyServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Metadata RPC -->
+ <servlet>
+ <servlet-name>metadata</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.http.RpcServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Serve social data -->
+ <servlet>
+ <servlet-name>socialdata</servlet-name>
+ <servlet-class>
+ org.apache.shindig.social.GadgetDataServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- javascript serving -->
+ <servlet>
+ <servlet-name>js</servlet-name>
+ <servlet-class>org.apache.shindig.gadgets.http.JsServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>js</servlet-name>
+ <url-pattern>/gadgets/js/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>proxy</servlet-name>
+ <url-pattern>/gadgets/proxy</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>xml-to-html</servlet-name>
+ <url-pattern>/gadgets/ifr</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>metadata</servlet-name>
+ <url-pattern>/gadgets/metadata</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>socialdata</servlet-name>
+ <url-pattern>/social/data</url-pattern>
+ </servlet-mapping>
+</web-app>
