You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by dd...@apache.org on 2007/02/09 17:00:25 UTC

svn commit: r505338 - in /tiles/framework/trunk: ./ tiles-api/ tiles-api/src/main/assembly/ tiles-core/ tiles-core/src/main/assembly/

Author: ddewolf
Date: Fri Feb  9 08:00:24 2007
New Revision: 505338

URL: http://svn.apache.org/viewvc?view=rev&rev=505338
Log:
TILES-209; Applying build improvement patch.  Thanks Niall

Added:
    tiles/framework/trunk/tiles-api/src/main/assembly/
    tiles/framework/trunk/tiles-api/src/main/assembly/bin.xml   (with props)
    tiles/framework/trunk/tiles-api/src/main/assembly/src.xml   (with props)
    tiles/framework/trunk/tiles-core/src/main/assembly/
    tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml   (with props)
    tiles/framework/trunk/tiles-core/src/main/assembly/src.xml   (with props)
Modified:
    tiles/framework/trunk/NOTICE.txt
    tiles/framework/trunk/pom.xml
    tiles/framework/trunk/tiles-api/pom.xml
    tiles/framework/trunk/tiles-core/pom.xml

Modified: tiles/framework/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/NOTICE.txt?view=diff&rev=505338&r1=505337&r2=505338
==============================================================================
--- tiles/framework/trunk/NOTICE.txt (original)
+++ tiles/framework/trunk/NOTICE.txt Fri Feb  9 08:00:24 2007
@@ -1,5 +1,5 @@
    Apache Tiles
-   Copyright 1999-2005 The Apache Software Foundation
+   Copyright 1999-2007 The Apache Software Foundation
 
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).

Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?view=diff&rev=505338&r1=505337&r2=505338
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Fri Feb  9 08:00:24 2007
@@ -43,7 +43,22 @@
                         <target>1.5</target>
                     </configuration>
                 </plugin>
-
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifestEntries>
+                                <Specification-Title>${project.name}</Specification-Title>
+                                <Specification-Version>${project.version}</Specification-Version>
+                                <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                                <Implementation-Title>${project.name}</Implementation-Title>
+                                <Implementation-Version>${project.version}</Implementation-Version>
+                                <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                                <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>retrotranslator-maven-plugin</artifactId>

Modified: tiles/framework/trunk/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/pom.xml?view=diff&rev=505338&r1=505337&r2=505338
==============================================================================
--- tiles/framework/trunk/tiles-api/pom.xml (original)
+++ tiles/framework/trunk/tiles-api/pom.xml Fri Feb  9 08:00:24 2007
@@ -63,12 +63,13 @@
 
         <plugins>
             <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
+                <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <archive>
-                        <manifest>
-                        </manifest>
-                    </archive>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                        <descriptor>src/main/assembly/src.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
             </plugin>
         </plugins>

Added: tiles/framework/trunk/tiles-api/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/assembly/bin.xml?view=auto&rev=505338
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/assembly/bin.xml (added)
+++ tiles/framework/trunk/tiles-api/src/main/assembly/bin.xml Fri Feb  9 08:00:24 2007
@@ -0,0 +1,43 @@
+<!--
+ 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>bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <includeSiteDirectory>false</includeSiteDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: tiles/framework/trunk/tiles-api/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-api/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Added: tiles/framework/trunk/tiles-api/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/assembly/src.xml?view=auto&rev=505338
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/assembly/src.xml (added)
+++ tiles/framework/trunk/tiles-api/src/main/assembly/src.xml Fri Feb  9 08:00:24 2007
@@ -0,0 +1,35 @@
+<!--
+ 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>src</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>pom.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: tiles/framework/trunk/tiles-api/src/main/assembly/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-api/src/main/assembly/src.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Modified: tiles/framework/trunk/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?view=diff&rev=505338&r1=505337&r2=505338
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Fri Feb  9 08:00:24 2007
@@ -70,6 +70,16 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                        <descriptor>src/main/assembly/src.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>

Added: tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml?view=auto&rev=505338
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml (added)
+++ tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml Fri Feb  9 08:00:24 2007
@@ -0,0 +1,43 @@
+<!--
+ 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>bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <includeSiteDirectory>false</includeSiteDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-core/src/main/assembly/bin.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Added: tiles/framework/trunk/tiles-core/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/assembly/src.xml?view=auto&rev=505338
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/assembly/src.xml (added)
+++ tiles/framework/trunk/tiles-core/src/main/assembly/src.xml Fri Feb  9 08:00:24 2007
@@ -0,0 +1,35 @@
+<!--
+ 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>src</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>pom.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src</directory>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: tiles/framework/trunk/tiles-core/src/main/assembly/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-core/src/main/assembly/src.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev