geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1104679 - in /geronimo/devtools/eclipse-plugin/trunk/assembly: pom.xml src/main/assembly/artifacts.xml src/main/assembly/content.xml src/main/assembly/p2repo.xml
Date Wed, 18 May 2011 03:53:26 GMT
Author: gawor
Date: Wed May 18 03:53:25 2011
New Revision: 1104679

URL: http://svn.apache.org/viewvc?rev=1104679&view=rev
Log:
GERONIMODEVTOOLS-740: Generate p2 metadata for GEP

Added:
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/artifacts.xml   (with
props)
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/content.xml   (with
props)
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=1104679&r1=1104678&r2=1104679&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Wed May 18 03:53:25 2011
@@ -43,6 +43,7 @@
                     <descriptors>
                         <descriptor>src/main/assembly/deployable.xml</descriptor>
                         <descriptor>src/main/assembly/updatesite.xml</descriptor>
+                        <descriptor>src/main/assembly/p2repo.xml</descriptor>
                     </descriptors>
                 </configuration>
                 <executions>
@@ -54,6 +55,42 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-p2-metadata</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <property name="assembly.dir" value="${basedir}/target/p2-tmp"/>
+                                <property name="input.zip" value="${basedir}/target/geronimo-eclipse-plugin-${project.parent.version}-p2repo.zip"/>
+                                <property name="output.zip" value="${input.zip}"/>
+                                <mkdir dir="${assembly.dir}"/>
+                                <makeurl property="assembly.dir.url" file="${assembly.dir}"/>
+                                <unzip src="${input.zip}" dest="${assembly.dir}" />
+                                <copy file="${basedir}/src/main/assembly/site.xml" todir="${assembly.dir}"/>
+                                <java fork="true" classname="org.eclipse.equinox.launcher.Main"

+                                      classpath="${eclipseInstall}/eclipse/plugins/org.eclipse.equinox.launcher_*.jar">
+                                    <classpath>
+                                        <fileset file="${eclipseInstall}/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"/>
+                                    </classpath>
+                                    <arg line="-application org.eclipse.equinox.p2.publisher.UpdateSitePublisher"/>
+                                    <arg line="-metadataRepository ${assembly.dir.url}"/>
 
+                                    <arg line="-artifactRepository ${assembly.dir.url}"/>
+                                    <arg line="-source ${assembly.dir}"/>
+                                </java>
+                                <zip destfile="${output.zip}" update="true" 
+                                     includes="artifacts.xml content.xml" basedir="${assembly.dir}"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
          <pluginManagement>
             <plugins>

Added: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/artifacts.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/artifacts.xml?rev=1104679&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/artifacts.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/artifacts.xml Wed May
18 03:53:25 2011
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?artifactRepository version='1.1.0'?>
+<!--
+  ~ 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.
+  -->
+<repository name='Geronimo Server Adapter p2 Artifact Repository' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository'
version='1'>
+
+  <mappings size='2'>
+    <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
+    <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
+  </mappings>
+
+</repository>

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/artifacts.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/artifacts.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/artifacts.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/content.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/content.xml?rev=1104679&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/content.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/content.xml Wed May
18 03:53:25 2011
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?metadataRepository version='1.1.0'?>
+<!--
+  ~ 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.
+  -->
+<repository name='Geronimo Server Adapter p2 Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository'
version='1'>
+</repository>

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/content.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/content.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/content.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml?rev=1104679&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml Wed May 18
03:53:25 2011
@@ -0,0 +1,109 @@
+<!--
+  ~ 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$ $Date$ -->
+
+<assembly>
+    <id>p2repo</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>..</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <files>
+        <file>
+            <source>${basedir}/src/main/assembly/content.xml</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+        <file>
+            <source>${basedir}/src/main/assembly/artifacts.xml</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+        <file>
+            <source>../features/org.apache.geronimo.v30.feature/target/classes/about_files/PLUGIN_RELEASE-NOTES-${pom.version}.txt</source>
+            <outputDirectory></outputDirectory>
+            <!--  <filtered>true</filtered>
+                 ${pom.version} does not get expanded by this filtering :-(
+                 so I take a filtered version from earlier in the build for GERONIMODEVTOOLS-505
+              -->
+        </file>
+    </files>
+    <dependencySets>
+
+        <!-- 
+         |
+         | Plug-ins
+         |
+         -->
+        <dependencySet>
+            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
+            <outputDirectory>plugins/</outputDirectory>
+            <unpack>false</unpack>
+            <includes>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.j2ee.v11.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.jaxbmodel.common</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
+                <!-- need to add jee.v22.jaxbmodel -->
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v22.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v22</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v30</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.schemas</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.schemas</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.ui</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.ui</include>
+             </includes>
+        </dependencySet>
+
+        <!-- 
+         |
+         | Features
+         |
+         -->
+        <dependencySet>
+            <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
+            <outputDirectory>features/</outputDirectory>
+            <includes>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.v30.feature</include>
+            </includes>
+        </dependencySet>
+
+    </dependencySets>
+</assembly>

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/p2repo.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message