You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2007/10/23 17:01:57 UTC

svn commit: r587532 - in /geronimo/devtools/j2g/trunk/assembly: pom.xml src/main/assembly/deployable.xml src/main/assembly/site.xml src/main/assembly/updatesite.xml

Author: linsun
Date: Tue Oct 23 08:01:56 2007
New Revision: 587532

URL: http://svn.apache.org/viewvc?rev=587532&view=rev
Log:
add site.xml for testing and a few minor updates to the assembly

Added:
    geronimo/devtools/j2g/trunk/assembly/src/main/assembly/site.xml   (with props)
Modified:
    geronimo/devtools/j2g/trunk/assembly/pom.xml
    geronimo/devtools/j2g/trunk/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/j2g/trunk/assembly/src/main/assembly/updatesite.xml

Modified: geronimo/devtools/j2g/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/assembly/pom.xml?rev=587532&r1=587531&r2=587532&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/assembly/pom.xml Tue Oct 23 08:01:56 2007
@@ -102,7 +102,7 @@
        	<dependency>
             <groupId>org.apache.geronimo.devtools.j2g</groupId>
             <artifactId>org.apache.geronimo.devtools.j2g.feature</artifactId>
-            <version>${version}</version>
+            <version>${org.apache.geronimo.devtools.j2g.feature_version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/devtools/j2g/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/assembly/src/main/assembly/deployable.xml?rev=587532&r1=587531&r2=587532&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/j2g/trunk/assembly/src/main/assembly/deployable.xml Tue Oct 23 08:01:56 2007
@@ -65,11 +65,11 @@
     </fileSets>
     <files>
         <file>
-            <source>../LICENSE.txt</source>
+            <source>LICENSE.txt</source>
             <outputDirectory>/</outputDirectory>
         </file>
         <file>
-            <source>../NOTICE.txt</source>
+            <source>NOTICE.txt</source>
             <outputDirectory>/</outputDirectory>
         </file>
     </files>

Added: geronimo/devtools/j2g/trunk/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/assembly/src/main/assembly/site.xml?rev=587532&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/assembly/src/main/assembly/site.xml (added)
+++ geronimo/devtools/j2g/trunk/assembly/src/main/assembly/site.xml Tue Oct 23 08:01:56 2007
@@ -0,0 +1,34 @@
+<?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.
+  -->
+
+<!-- $Rev: 533812 $ $Date: 2007-04-30 13:38:23 -0400 (Mon, 30 Apr 2007) $ -->
+
+<!-- site mirrorsURL="http://geronimo.apache.org/devtools/geronimo-eclipse-update- -xml.cgi" -->
+<site>
+
+    <description>Apache Geronimo Eclipse Update Site</description>
+    
+    <category-def name="J2G" label="Jboss to Geronimo Migration Tool"/>
+
+    <feature url="features/org.apache.geronimo.devtools.j2g.feature_1.0.0.jar"
+             id="org.apache.geronimo.devtools.j2g.feature" version="1.0.0">
+        <category name="J2G"/>
+    </feature>
+    
+</site>

Propchange: geronimo/devtools/j2g/trunk/assembly/src/main/assembly/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/devtools/j2g/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/assembly/src/main/assembly/updatesite.xml?rev=587532&r1=587531&r2=587532&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/j2g/trunk/assembly/src/main/assembly/updatesite.xml Tue Oct 23 08:01:56 2007
@@ -40,11 +40,17 @@
         </dependencySet>
         <!-- Features -->
         <dependencySet>
-            <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
+            <outputFileNameMapping>${artifactId}_1.0.0.${extension}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>
             <includes>
                 <include>org.apache.geronimo.devtools.j2g:org.apache.geronimo.devtools.j2g.feature</include>
             </includes>
         </dependencySet>
     </dependencySets>
+    <files>
+        <file>
+            <source>${basedir}/src/main/assembly/site.xml</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+    </files>
 </assembly>