Author: ieb
Date: Wed Dec 10 18:56:27 2008
New Revision: 725555

URL: http://svn.apache.org/viewvc?rev=725555&view=rev
Log:
Modified build of the binary distros to use artifacts and include various files.

Added:
    
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary-src/
    
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary-src/README
   (with props)
Modified:
    incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml
    
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml

Modified: incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml?rev=725555&r1=725554&r2=725555&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml Wed Dec 10 
18:56:27 2008
@@ -84,5 +84,32 @@
       </plugin>
     </plugins>
   </build>
-  <dependencies/>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-gadgets</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-social-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-features</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-server</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+  </dependencies>
 </project>

Added: 
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary-src/README
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary-src/README?rev=725555&view=auto
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary-src/README
 (added)
+++ 
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary-src/README
 Wed Dec 10 18:56:27 2008
@@ -0,0 +1,11 @@
+Welcome to Apache Shindig ${project.version} !
+
+Apache Shindig is a reference implementation of the OpenSocial specification.
+
+This is the binary distribution for Shindig, containing a configured war 
containing
+the sample server and the individual jar files for the features, common, 
gadgets and
+social-api projects. In addition there are source jars which can be used for 
in an IDE
+when debugging. If you intend to work with the Shindig source, then please 
download a 
+source distribution.
+
+For more information, see http://incubator.apache.org/shindig/

Propchange: 
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary-src/README
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml?rev=725555&r1=725554&r2=725555&view=diff
==============================================================================
--- 
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
 (original)
+++ 
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
 Wed Dec 10 18:56:27 2008
@@ -7,40 +7,35 @@
     <format>tar.bz2</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <outputDirectory>shindig-binary</outputDirectory>
-      <directory>../features/target/</directory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
+  <dependencySets>
+    <dependencySet>
       <outputDirectory>shindig-binary</outputDirectory>
-      <directory>../java/common/target/</directory>
+      
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
       <includes>
-        <include>*.jar</include>
+        <include>*:war:*</include>
+        <include>*:jar:*</include>
       </includes>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>shindig-binary</outputDirectory>
-      <directory>../java/gadgets/target/</directory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
     <fileSet>
       <outputDirectory>shindig-binary</outputDirectory>
-      <directory>../java/social-api/target/</directory>
+      <directory>../</directory>
       <includes>
-        <include>*.jar</include>
+        <include>COMMITTERS</include>
+        <include>COPYING</include>
+        <include>DISCLAIMER</include>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>shindig-binary</outputDirectory>
-      <directory>../java/server/target/</directory>
+      <directory>src/main/assembly/binary-src/</directory>
+      <filtered>true</filtered>
       <includes>
-        <include>*.war</include>
+        <include>**/*</include>
       </includes>
     </fileSet>
   </fileSets>


Reply via email to