You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/05/16 13:09:02 UTC
svn commit: r657017 - in /incubator/shindig/trunk: features/pom.xml
java/gadgets/pom.xml java/pom.xml java/server/pom.xml pom.xml
Author: etnu
Date: Fri May 16 04:09:01 2008
New Revision: 657017
URL: http://svn.apache.org/viewvc?rev=657017&view=rev
Log:
Applied SHINDIG-269, from Henning Schmiedehausen, with one modification to features/pom.xml to include all nested files.
This change also facilitates a cleaner mechanism for running js unit tests. All test files will have to be added to the pom, which is still unweildy, but it's an improvement.
Added:
incubator/shindig/trunk/features/pom.xml
Modified:
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/pom.xml
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/pom.xml
Added: incubator/shindig/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/pom.xml?rev=657017&view=auto
==============================================================================
--- incubator/shindig/trunk/features/pom.xml (added)
+++ incubator/shindig/trunk/features/pom.xml Fri May 16 04:09:01 2008
@@ -0,0 +1,145 @@
+<?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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>shindig-features</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache Shindig Features</name>
+ <description>Packages all the features that shindig provides into a single jar file to allow
+ loading from the classpath</description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/features</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/features</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/features</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins </groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ </plugin>
+ <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>target/**</exclude>
+ <!-- don't bother with other file types. -->
+ <exclude>**/*.xml</exclude>
+ <exclude>**/*.html</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.png</exclude>
+
+ <!-- Caja has some bugs too -->
+ <exclude>**/caja/*.js</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>de.berlios.jsunit</groupId>
+ <artifactId>jsunit-maven2-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test</id>
+ <configuration>
+ <sourceDirectory>${basedir}</sourceDirectory>
+ <sources>
+ <source>opensocial-reference/opensocial.js</source>
+ <source>opensocial-reference/activity.js</source>
+ <source>opensocial-reference/address.js</source>
+ <source>opensocial-reference/bodytype.js</source>
+ <source>opensocial-reference/collection.js</source>
+ <source>opensocial-reference/container.js</source>
+ <source>opensocial-reference/datarequest.js</source>
+ <source>opensocial-reference/dataresponse.js</source>
+ <source>opensocial-reference/email.js</source>
+ <source>opensocial-reference/enum.js</source>
+ <source>opensocial-reference/environment.js</source>
+ <source>opensocial-reference/message.js</source>
+ <source>opensocial-reference/name.js</source>
+ <source>opensocial-reference/organization.js</source>
+ <source>opensocial-reference/person.js</source>
+ <source>opensocial-reference/phone.js</source>
+ <source>opensocial-reference/responseitem.js</source>
+ <source>opensocial-reference/url.js</source>
+ <source>opensocial-0.7/batchrequest.js</source>
+ <source>opensocial-0.7/jsonactivity.js</source>
+ <source>opensocial-0.7/jsonperson.js</source>
+ <source>opensocial-0.7/jsoncontainer.js</source>
+ </sources>
+ <testSourceDirectory>${basedir}</testSourceDirectory>
+ <testSuites>
+ <testSuite>
+ <name>OpenSocialJsTests</name>
+ <type>TESTCASES</type>
+ <includes>
+ <include>opensocial-reference/*test.js</include>
+ <include>opensocial-0.7/*test.js</include>
+ </includes>
+ </testSuite>
+ </testSuites>
+ </configuration>
+ <goals>
+ <goal>jsunit-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <targetPath>/features</targetPath>
+ <directory>${basedir}</directory>
+ <excludes>
+ <exclude>pom.xml</exclude>
+ <exclude>target/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
+ <dependencies/>
+</project>
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=657017&r1=657016&r2=657017&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Fri May 16 04:09:01 2008
@@ -76,98 +76,9 @@
</compilerArguments>
</configuration>
</plugin>
- <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>
- <!-- don't bother with other file types. -->
- <exclude>**/*.xml</exclude>
- <exclude>**/*.html</exclude>
- <exclude>**/*.gif</exclude>
- <exclude>**/*.jpeg</exclude>
- <exclude>**/*.png</exclude>
- <!-- Container files are JSON, not javascript -->
- <exclude>**/*container*.js</exclude>
- <!-- same for oauth config -->
- <exclude>**/oauth.js</exclude>
- <!-- Caja has some bugs too -->
- <exclude>**/caja/*.js</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>de.berlios.jsunit</groupId>
- <artifactId>jsunit-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>test</id>
- <configuration>
- <sourceDirectory>${basedir}/../../</sourceDirectory>
- <sources>
- <source>features/opensocial-reference/opensocial.js</source>
- <source>features/opensocial-reference/activity.js</source>
- <source>features/opensocial-reference/address.js</source>
- <source>features/opensocial-reference/bodytype.js</source>
- <source>features/opensocial-reference/collection.js</source>
- <source>features/opensocial-reference/container.js</source>
- <source>features/opensocial-reference/datarequest.js</source>
- <source>features/opensocial-reference/dataresponse.js</source>
- <source>features/opensocial-reference/email.js</source>
- <source>features/opensocial-reference/enum.js</source>
- <source>features/opensocial-reference/environment.js</source>
- <source>features/opensocial-reference/message.js</source>
- <source>features/opensocial-reference/name.js</source>
- <source>features/opensocial-reference/organization.js</source>
- <source>features/opensocial-reference/person.js</source>
- <source>features/opensocial-reference/phone.js</source>
- <source>features/opensocial-reference/responseitem.js</source>
- <source>features/opensocial-reference/url.js</source>
- <source>features/opensocial-0.7/batchrequest.js</source>
- <source>features/opensocial-0.7/jsonactivity.js</source>
- <source>features/opensocial-0.7/jsonperson.js</source>
- <source>features/opensocial-0.7/jsoncontainer.js</source>
- </sources>
- <testSourceDirectory>${basedir}/../../</testSourceDirectory>
- <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
- <testSuites>
- <testSuite>
- <name>OpenSocialJsTests</name>
- <type>TESTCASES</type>
- <includes>
- <include>features/opensocial-reference/*test.js</include>
- <include>features/opensocial-0.7/*test.js</include>
- </includes>
- </testSuite>
- </testSuites>
- </configuration>
- <goals>
- <goal>jsunit-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<resources>
<resource>
- <targetPath>features</targetPath>
- <directory>${basedir}/../../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 -->
Modified: incubator/shindig/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/pom.xml?rev=657017&r1=657016&r2=657017&view=diff
==============================================================================
--- incubator/shindig/trunk/java/pom.xml (original)
+++ incubator/shindig/trunk/java/pom.xml Fri May 16 04:09:01 2008
@@ -37,6 +37,7 @@
<module>gadgets</module>
<module>social-api</module>
<module>server</module>
+ <module>../features</module>
</modules>
<scm>
Modified: incubator/shindig/trunk/java/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=657017&r1=657016&r2=657017&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Fri May 16 04:09:01 2008
@@ -73,10 +73,6 @@
</plugins>
<resources>
<resource>
- <targetPath>features</targetPath>
- <directory>${basedir}/../../features</directory>
- </resource>
- <resource>
<directory>${basedir}/../../javascript/</directory>
<targetPath>/gadgets/files</targetPath>
<includes>
@@ -113,6 +109,10 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-features</artifactId>
+ </dependency>
<!-- external dependencies -->
</dependencies>
Modified: incubator/shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=657017&r1=657016&r2=657017&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Fri May 16 04:09:01 2008
@@ -276,6 +276,14 @@
</modules>
</profile>
+ <!-- profile to build features jar -->
+ <profile>
+ <id>features</id>
+ <modules>
+ <module>features</module>
+ </modules>
+ </profile>
+
<!-- profile to build java/gadgets -->
<profile>
<id>gadgets</id>
@@ -682,6 +690,11 @@
<!-- project dependencies -->
<dependency>
<groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-features</artifactId>
+ <version>1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
<version>1-SNAPSHOT</version>
</dependency>