You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/05/17 06:50:37 UTC
svn commit: r944968 - in /shindig/trunk: ./ extras/ extras/src/
extras/src/main/ extras/src/main/java/ extras/src/main/java/org/
extras/src/main/java/org/apache/ extras/src/main/java/org/apache/shindig/
extras/src/main/java/org/apache/shindig/extras/ e...
Author: lindner
Date: Mon May 17 04:50:36 2010
New Revision: 944968
URL: http://svn.apache.org/viewvc?rev=944968&view=rev
Log:
Add an extras module to shindig to allow for deprecated, new, or unstable code
Added:
shindig/trunk/extras/
shindig/trunk/extras/pom.xml
shindig/trunk/extras/src/
shindig/trunk/extras/src/main/
shindig/trunk/extras/src/main/java/
shindig/trunk/extras/src/main/java/org/
shindig/trunk/extras/src/main/java/org/apache/
shindig/trunk/extras/src/main/java/org/apache/shindig/
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java
shindig/trunk/extras/src/main/javascript/
shindig/trunk/extras/src/main/javascript/features-extras/
shindig/trunk/extras/src/main/javascript/features-extras/features.txt
shindig/trunk/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/
shindig/trunk/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml
- copied, changed from r944947, shindig/trunk/features/src/main/javascript/features/org.jquery.core-1.4.2/feature.xml
Removed:
shindig/trunk/features/src/main/javascript/features/org.jquery.core-1.4.2/feature.xml
Modified:
shindig/trunk/.gitignore
shindig/trunk/features/src/main/javascript/features/features.txt
shindig/trunk/java/server/pom.xml
shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
shindig/trunk/pom.xml
Modified: shindig/trunk/.gitignore
URL: http://svn.apache.org/viewvc/shindig/trunk/.gitignore?rev=944968&r1=944967&r2=944968&view=diff
==============================================================================
--- shindig/trunk/.gitignore (original)
+++ shindig/trunk/.gitignore Mon May 17 04:50:36 2010
@@ -206,3 +206,24 @@
/java/social-api/drop.sql
/java/social-api/derby.log
/java/social-api/maven-eclipse.xml
+
+# extras/
+/extras/target
+/extras/work
+/extras/dojo
+/extras/*.iws
+/extras/*.ipr
+/extras/*.iml
+/extras/derby.log
+/extras/maven.log
+/extras/build.xml
+/extras/build-dependency.xml
+/extras/velocity.log*
+/extras/junit*.properties
+/extras/surefire*.properties
+/extras/.project
+/extras/.classpath
+/extras/.settings
+/extras/.deployables
+/extras/.wtpmodules
+/extras/.externalToolBuilders
Added: shindig/trunk/extras/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/extras/pom.xml?rev=944968&view=auto
==============================================================================
--- shindig/trunk/extras/pom.xml (added)
+++ shindig/trunk/extras/pom.xml Mon May 17 04:50:36 2010
@@ -0,0 +1,141 @@
+<?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>2.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>shindig-extras</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Shindig Extra Modules</name>
+ <description>Provides extra, deprecated or extended functionality. The items here have unstable APIs and could change at any time.</description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/extras</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/extras</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/trunk/java/extras</url>
+ </scm>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/javascript</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <!-- set versions of common plugins for reproducibility, ordered alphabetically by owner -->
+ <plugins>
+ <!-- Misc -->
+ <plugin>
+ <groupId>de.berlios.jsunit</groupId>
+ <artifactId>jsunit-maven2-plugin</artifactId>
+ <version>1.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>net.sf.alchim</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>0.7.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- TODO: Replace this with the more generic javascript plugin that
+ allows the use of arbitrary compressor / compilers.
+ The maven-javascript-plugin does not seem to work.
+ -->
+ <!-- <groupId>net.sf.hammerfest</groupId> -->
+ <!-- <artifactId>maven-javascript-plugin</artifactId> -->
+ <groupId>net.sf.alchim</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <suffix>.opt</suffix>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ </excludes>
+ <jswarn>false</jswarn>
+ <statistics>false</statistics>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <!-- project dependencies -->
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-gadgets</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ </dependency>
+ <!-- external depenencies -->
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ </dependency>
+
+ <!-- test -->
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-social-api</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: shindig/trunk/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java?rev=944968&view=auto
==============================================================================
--- shindig/trunk/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java (added)
+++ shindig/trunk/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java Mon May 17 04:50:36 2010
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package org.apache.shindig.contrib;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.CreationException;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.name.Names;
+import com.google.inject.spi.Message;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.shindig.common.util.ResourceLoader;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Properties;
+
+/**
+ * Configures the Extra modules in shindig-extras.
+ */
+public class ShindigExtrasGuiceModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ configureExtraFeatures();
+ }
+
+ protected void configureExtraFeatures() {
+ // This is how you add search paths for features.
+ Multibinder<String> featureBinder = Multibinder.newSetBinder(binder(), String.class, Names.named("org.apache.shindig.features"));
+ featureBinder.addBinding().toInstance("res://features-extras/features.txt");
+ }
+}
Added: shindig/trunk/extras/src/main/javascript/features-extras/features.txt
URL: http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/javascript/features-extras/features.txt?rev=944968&view=auto
==============================================================================
--- shindig/trunk/extras/src/main/javascript/features-extras/features.txt (added)
+++ shindig/trunk/extras/src/main/javascript/features-extras/features.txt Mon May 17 04:50:36 2010
@@ -0,0 +1 @@
+features/org.jquery.core-1.4.2/feature.xml
Copied: shindig/trunk/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml (from r944947, shindig/trunk/features/src/main/javascript/features/org.jquery.core-1.4.2/feature.xml)
URL: http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml?p2=shindig/trunk/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml&p1=shindig/trunk/features/src/main/javascript/features/org.jquery.core-1.4.2/feature.xml&r1=944947&r2=944968&rev=944968&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/org.jquery.core-1.4.2/feature.xml (original)
+++ shindig/trunk/extras/src/main/javascript/features-extras/org.jquery.core-1.4.2/feature.xml Mon May 17 04:50:36 2010
@@ -19,9 +19,9 @@ specific language governing permissions
<feature>
<name>org.jquery.core-1.4.2</name>
<gadget>
- <script inline="false" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"/>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"/>
</gadget>
<container>
- <script inline="false" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"/>
+ <script inline="true" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"/>
</container>
</feature>
Modified: shindig/trunk/features/src/main/javascript/features/features.txt
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/features.txt?rev=944968&r1=944967&r2=944968&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/features.txt (original)
+++ shindig/trunk/features/src/main/javascript/features/features.txt Mon May 17 04:50:36 2010
@@ -67,4 +67,3 @@ features/views/feature.xml
features/xhrwrapper/feature.xml
features/xmlutil/feature.xml
features/com.google.gadgets.analytics/feature.xml
-features/org.jquery.core-1.4.2/feature.xml
Modified: shindig/trunk/java/server/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/pom.xml?rev=944968&r1=944967&r2=944968&view=diff
==============================================================================
--- shindig/trunk/java/server/pom.xml (original)
+++ shindig/trunk/java/server/pom.xml Mon May 17 04:50:36 2010
@@ -127,6 +127,11 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-features</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-extras</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- external dependencies -->
<dependency>
Modified: shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=944968&r1=944967&r2=944968&view=diff
==============================================================================
--- shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml (original)
+++ shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Mon May 17 04:50:36 2010
@@ -35,7 +35,8 @@
org.apache.shindig.social.sample.SampleModule:
org.apache.shindig.gadgets.oauth.OAuthModule:
org.apache.shindig.common.cache.ehcache.EhCacheModule:
- org.apache.shindig.sample.shiro.ShiroModule
+ org.apache.shindig.sample.shiro.ShiroModule:
+ org.apache.shindig.extras.ShindigExtrasGuiceModule
</param-value>
</context-param>
Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=944968&r1=944967&r2=944968&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Mon May 17 04:50:36 2010
@@ -403,6 +403,7 @@
<module>java/gadgets</module>
<module>java/social-api</module>
<module>java/server</module>
+ <module>extras</module>
</modules>
</profile>
@@ -506,6 +507,7 @@
<module>java/social-api</module>
<module>java/server</module>
<module>java/samples</module>
+ <module>extras</module>
</modules>
<build>
<plugins>
@@ -798,6 +800,7 @@
<module>java/social-api</module>
<module>java/server</module>
<module>java/samples</module>
+ <module>extras</module>
<module>assembly</module>
</modules>
<build>
@@ -881,6 +884,7 @@
<module>java/gadgets</module>
<module>java/social-api</module>
<module>java/server</module>
+ <module>extras</module>
<module>assembly</module>
</modules>
</profile>
@@ -1346,6 +1350,11 @@
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-extras</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>