tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r1098346 - in /tuscany/sca-java-1.x/trunk: distribution/src/main/assembly/ tools/eclipse/site/updatesite/ tools/eclipse/site/updatesite/filtered-resources/ tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/ tools/eclipse/si...
Date Sun, 01 May 2011 14:57:08 GMT
Author: nash
Date: Sun May  1 14:57:07 2011
New Revision: 1098346

URL: http://svn.apache.org/viewvc?rev=1098346&view=rev
Log:
TUSCANY-3860: Build updatesite contents for site-publish as part of the distribution output

Added:
    tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/.htaccess
      - copied, changed from r1098260, tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/.htaccess
    tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site--xml.html
      - copied, changed from r1098260, tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/site--xml.html
    tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/index.html
      - copied unchanged from r1098260, tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/index.html
    tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/site--xml.cgi
      - copied unchanged from r1098260, tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/site--xml.cgi
    tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/web/
      - copied from r1098260, tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/web/
Modified:
    tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/updatesite.xml
    tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
    tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml

Modified: tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/updatesite.xml?rev=1098346&r1=1098345&r2=1098346&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/updatesite.xml (original)
+++ tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/updatesite.xml Sun May  1 14:57:07
2011
@@ -33,6 +33,7 @@
 			<outputDirectory></outputDirectory>
             <excludes>
                 <exclude>tuscany-sca-${tuscany.version}-updatesite/LICENSE</exclude>
+                <exclude>tuscany-sca-${tuscany.version}-updatesite-publish/LICENSE</exclude>
                 <exclude>tuscany-sca-${tuscany.version}-updatesite/features/*</exclude>
             </excludes>
 		</fileSet>
@@ -43,5 +44,12 @@
                 <include>LICENSE</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>src/main/release/bin</directory>
+            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite-publish</outputDirectory>
+            <includes>
+                <include>LICENSE</include>
+            </includes>
+        </fileSet>
 	</fileSets>
 </assembly>

Copied: tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/.htaccess
(from r1098260, tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/.htaccess)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/.htaccess?p2=tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/.htaccess&p1=tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/.htaccess&r1=1098260&r2=1098346&rev=1098346&view=diff
==============================================================================
--- tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/.htaccess (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/.htaccess
Sun May  1 14:57:07 2011
@@ -1,6 +1,6 @@
 RewriteEngine on
 
-RewriteBase /updatesite/java/sca/1.6.2
+RewriteBase /updatesite/java/sca/${pom.version}
 
 RewriteRule ^site.xml$ site--xml.cgi [L]
 

Copied: tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site--xml.html
(from r1098260, tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/site--xml.html)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site--xml.html?p2=tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site--xml.html&p1=tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/site--xml.html&r1=1098260&r2=1098346&rev=1098346&view=diff
==============================================================================
--- tuscany/site/trunk/site-publish/updatesite/java/sca/1.6.2/site--xml.html (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site--xml.html
Sun May  1 14:57:07 2011
@@ -22,13 +22,13 @@
       Apache Tuscany SCA Eclipse Tools
    </description>
    
-   <feature id="org.apache.tuscany.sca.feature.core" version="1.6.2.v20110405-2255"
-      url="[preferred]/tuscany/java/sca/1.6.2/tuscany-sca-1.6.2-updatesite/features/org.apache.tuscany.sca.feature.core-1.6.2.jar">
+   <feature id="org.apache.tuscany.sca.feature.core" version="${tuscany.eclipse.version}"
+      url="[preferred]/tuscany/java/sca/${pom.version}/tuscany-sca-${pom.version}-updatesite/features/org.apache.tuscany.sca.feature.core-${pom.version}.jar">
       <category name="Apache Tuscany SCA Eclipse Tools"/>
    </feature>
    
-   <archive path="plugins/org.apache.tuscany.sca.core_1.6.2.v20110405-2255.jar"
-      url="[preferred]/tuscany/java/sca/1.6.2/tuscany-sca-1.6.2-updatesite/plugins/org.apache.tuscany.sca.core_1.6.2.v20110405-2255.jar"/>
+   <archive path="plugins/org.apache.tuscany.sca.core_${tuscany.eclipse.version}.jar"
+      url="[preferred]/tuscany/java/sca/${pom.version}/tuscany-sca-${pom.version}-updatesite/plugins/org.apache.tuscany.sca.core_${tuscany.eclipse.version}.jar"/>
 
    <category-def name="Apache Tuscany SCA Eclipse Tools" label="Apache Tuscany SCA Eclipse
Tools">
       <description>

Modified: tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml?rev=1098346&r1=1098345&r2=1098346&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
Sun May  1 14:57:07 2011
@@ -26,7 +26,7 @@
 
     <fileSets>
         <fileSet>
-            <directory>target/classes</directory>
+            <directory>.</directory>
             <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
             <includes>
                 <include>LICENSE</include>
@@ -34,6 +34,19 @@
                 <include>site.xml</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>.</directory>
+            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite-publish</outputDirectory>
+            <includes>
+                <include>LICENSE</include>
+                <include>NOTICE</include>
+                <include>.htaccess</include>
+                <include>index.html</include>
+                <include>site--xml.cgi</include>
+                <include>site--xml.html</include>
+                <include>web/**</include>
+            </includes>
+        </fileSet>
     </fileSets>
         
     <files>

Modified: tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml?rev=1098346&r1=1098345&r2=1098346&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml Sun May  1 14:57:07 2011
@@ -51,16 +51,12 @@
             <filter>${basedir}/../../target/filter.properties</filter>
         </filters>
 
+        <!-- No need to copy resources because the assembly plugin gets them from basedir
-->
         <resources>
             <resource>
                 <directory>${basedir}</directory>
                 <excludes>
-                    <exclude>src/**</exclude>
-                    <exclude>**/.*/**</exclude>
-                    <exclude>pom.xml</exclude>
-                    <exclude>build.*</exclude>
-                    <exclude>filtered-resources/**</exclude>
-                    <exclude>target/**</exclude>
+                    <exclude>**/*</exclude>
                 </excludes>
             </resource>
         </resources>
@@ -121,6 +117,8 @@
                             <includes>
                                 <include>site.xml</include>
                                 <include>NOTICE</include>
+                                <include>.htaccess</include>
+                                <include>site--xml.html</include>
                                 <include>src/**</include>
                             </includes>
                         </fileset>



Mime
View raw message