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/08/16 10:35:04 UTC

svn commit: r985826 - in /shindig/trunk: assembly/pom.xml assembly/src/main/assembly/java.xml assembly/src/main/assembly/php.xml pom.xml

Author: lindner
Date: Mon Aug 16 08:35:04 2010
New Revision: 985826

URL: http://svn.apache.org/viewvc?rev=985826&view=rev
Log:
cleanup java/php packaging

Modified:
    shindig/trunk/assembly/pom.xml
    shindig/trunk/assembly/src/main/assembly/java.xml
    shindig/trunk/assembly/src/main/assembly/php.xml
    shindig/trunk/pom.xml

Modified: shindig/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/assembly/pom.xml?rev=985826&r1=985825&r2=985826&view=diff
==============================================================================
--- shindig/trunk/assembly/pom.xml (original)
+++ shindig/trunk/assembly/pom.xml Mon Aug 16 08:35:04 2010
@@ -146,6 +146,11 @@ year=${year}
     </dependency>
     <dependency>
       <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-extras</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
       <artifactId>shindig-server</artifactId>
       <version>${project.version}</version>
       <type>war</type>

Modified: shindig/trunk/assembly/src/main/assembly/java.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/assembly/src/main/assembly/java.xml?rev=985826&r1=985825&r2=985826&view=diff
==============================================================================
--- shindig/trunk/assembly/src/main/assembly/java.xml (original)
+++ shindig/trunk/assembly/src/main/assembly/java.xml Mon Aug 16 08:35:04 2010
@@ -34,6 +34,7 @@
         <include>org.apache.shindig:shindig-features</include>
         <include>org.apache.shindig:shindig-gadgets</include>
         <include>org.apache.shindig:shindig-social-api</include>
+        <include>org.apache.shindig:shindig-extras</include>
       </includes>
     </dependencySet>
   </dependencySets>
@@ -66,7 +67,7 @@
     </file>
     <file>
       <source>../java/NOTICE</source>
-      <outputDirectory>shindig-${projet.version}-java</outputDirectory>
+      <outputDirectory>shindig-${project.version}-java</outputDirectory>
       <filtered>true</filtered>
     </file>
   </files>

Modified: shindig/trunk/assembly/src/main/assembly/php.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/assembly/src/main/assembly/php.xml?rev=985826&r1=985825&r2=985826&view=diff
==============================================================================
--- shindig/trunk/assembly/src/main/assembly/php.xml (original)
+++ shindig/trunk/assembly/src/main/assembly/php.xml Mon Aug 16 08:35:04 2010
@@ -30,8 +30,9 @@
       <directory>../</directory>
       <includes>
         <include>features/**</include>
-        <include>javascript/**</include>
+        <include>content/**</include>
         <include>config/**</include>
+        <include>extras/src/main/javascript/**</include>
       </includes>
       <excludes>
         <exclude>site/**</exclude>

Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=985826&r1=985825&r2=985826&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Mon Aug 16 08:35:04 2010
@@ -470,6 +470,11 @@
           <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+          <groupId>org.apache.shindig</groupId>
+          <artifactId>shindig-extras</artifactId>
+          <version>${project.version}</version>
+        </dependency>
         <!-- external dependencies -->
       </dependencies>