From fdb890085bc1fd3f4cc15f89c7c0aa2fa6cda0ec Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 14 Nov 2010 21:45:57 +0000
Subject: Merge r1035067 TUSCANY-3762: Move filtered resources into new
 filtered-resources directory

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035079 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/tools/eclipse/site/updatesite/NOTICE     |  6 ---
 .../site/updatesite/filtered-resources/NOTICE      |  6 +++
 .../site/updatesite/filtered-resources/site.xml    | 38 ++++++++++++++++
 .../src/main/assembly/updatesite.xml               | 52 ++++++++++++++++++++++
 .../trunk/tools/eclipse/site/updatesite/pom.xml    | 52 +++++++++++++++++++---
 .../trunk/tools/eclipse/site/updatesite/site.xml   | 38 ----------------
 .../updatesite/src/main/assembly/updatesite.xml    | 52 ----------------------
 7 files changed, 142 insertions(+), 102 deletions(-)
 delete mode 100644 sca-java-1.x/trunk/tools/eclipse/site/updatesite/NOTICE
 create mode 100644 sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/NOTICE
 create mode 100644 sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site.xml
 create mode 100644 sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
 delete mode 100644 sca-java-1.x/trunk/tools/eclipse/site/updatesite/site.xml
 delete mode 100644 sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml

(limited to 'sca-java-1.x/trunk/tools/eclipse/site')

diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/NOTICE b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/NOTICE
deleted file mode 100644
index ad2ba40961..0000000000
--- a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/NOTICE b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/NOTICE
new file mode 100644
index 0000000000..ad2ba40961
--- /dev/null
+++ b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site.xml
new file mode 100644
index 0000000000..0a433ee065
--- /dev/null
+++ b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/site.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+<site>
+   <description url="http://tuscany.apache.org">
+      Apache Tuscany SCA Eclipse Tools
+   </description>
+   
+   <feature id="org.apache.tuscany.sca.feature.core" version="${tuscany.eclipse.version}"
+      url="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_${tuscany.eclipse.version}"
+      url="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>
+         The Apache Tuscany SCA Eclipse Tools category contains all features related to Apache Tuscany SCA.
+      </description>
+   </category-def>
+</site>
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
new file mode 100644
index 0000000000..6d11e978af
--- /dev/null
+++ b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
@@ -0,0 +1,52 @@
+<?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.
+-->
+<assembly>
+    <id>updatesite</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>dir</format>
+    </formats>
+
+    <fileSets>
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
+            <includes>
+                <include>LICENSE</include>
+                <include>NOTICE</include>
+                <include>site.xml</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+        
+    <files>
+        <file>
+            <source>../../plugins/core/target/org.apache.tuscany.sca.core-${tuscany.version}.jar</source>
+            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/plugins</outputDirectory>
+            <destName>org.apache.tuscany.sca.core_${tuscany.eclipse.version}.jar</destName>
+        </file>
+
+        <file>
+            <source>../../features/core/target/org.apache.tuscany.sca.feature.core-${tuscany.version}.jar</source>
+            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/features</outputDirectory>
+        </file>
+    </files>
+
+</assembly>
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
index baa08ff1f7..d3832313dc 100644
--- a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
@@ -46,15 +46,11 @@
     </dependencies>
 
     <build>
-        <filters>
-            <filter>../../target/filter.properties</filter>
-        </filters>
-
         <resources>
             <resource>
                 <directory>${basedir}</directory>
-                <filtering>true</filtering>
                 <excludes>
+                    <exclude>src/**</exclude>
                     <exclude>**/.*/**</exclude>
                     <exclude>pom.xml</exclude>
                     <exclude>build.*</exclude>
@@ -64,6 +60,33 @@
         </resources>
        
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+                    <execution>
+                        <id>copy-filtered-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}</outputDirectory>
+                            <filters>
+                                <filter>${basedir}/../../target/filter.properties</filter>
+                            </filters>
+                            <resources>          
+                                <resource>
+                                    <directory>${basedir}/filtered-resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>              
+                        </configuration>            
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -76,7 +99,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>target/classes/src/main/assembly/updatesite.xml</descriptor>
+                                <descriptor>src/main/assembly/updatesite.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
                             <finalName>apache-tuscany-sca-${pom.version}</finalName>
@@ -84,6 +107,23 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+                        <fileset>
+                            <directory>${basedir}</directory>
+                            <includes>
+                                <include>site.xml</include>
+                                <include>NOTICE</include>
+                                <include>src/main/assembly/updatesite.xml</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/site.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/site.xml
deleted file mode 100644
index 0a433ee065..0000000000
--- a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/site.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.
--->
-<site>
-   <description url="http://tuscany.apache.org">
-      Apache Tuscany SCA Eclipse Tools
-   </description>
-   
-   <feature id="org.apache.tuscany.sca.feature.core" version="${tuscany.eclipse.version}"
-      url="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_${tuscany.eclipse.version}"
-      url="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>
-         The Apache Tuscany SCA Eclipse Tools category contains all features related to Apache Tuscany SCA.
-      </description>
-   </category-def>
-</site>
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
deleted file mode 100644
index 6d11e978af..0000000000
--- a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.
--->
-<assembly>
-    <id>updatesite</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>dir</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
-            <includes>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-                <include>site.xml</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-        
-    <files>
-        <file>
-            <source>../../plugins/core/target/org.apache.tuscany.sca.core-${tuscany.version}.jar</source>
-            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/plugins</outputDirectory>
-            <destName>org.apache.tuscany.sca.core_${tuscany.eclipse.version}.jar</destName>
-        </file>
-
-        <file>
-            <source>../../features/core/target/org.apache.tuscany.sca.feature.core-${tuscany.version}.jar</source>
-            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/features</outputDirectory>
-        </file>
-    </files>
-
-</assembly>
-- 
cgit v1.2.3