Commit in projects/lcsim/trunk on MAIN | |||
distribution/pom.xml | +12 | -87 | 2971 -> 2972 |
plugin/pom.xml | +93 | -28 | 2971 -> 2972 |
plugin/src/main/resources/PLUGIN-inf/plugins.xml | +29 | added 2972 | |
pom.xml | +9 | -5 | 2971 -> 2972 |
+143 | -120 |
move plugin configuration to plugin module; remove from distribution; plugin now depends on distribution
--- projects/lcsim/trunk/distribution/pom.xml 2014-02-10 23:42:31 UTC (rev 2971) +++ projects/lcsim/trunk/distribution/pom.xml 2014-02-10 23:43:44 UTC (rev 2972) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <artifactId>lcsim-distribution</artifactId> <name>distribution</name>
- <description>distribution package for generating the runnable bin jar and packaging the JAS plugin</description>
+ <description>distribution package for generating the standalone runnable bin jar</description>
<parent> <groupId>org.lcsim</groupId>
@@ -19,57 +19,8 @@
</scm> <build>
- <resources> - <resource> - <directory>${basedir}/src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/plugins.xml</include> - </includes> - </resource> - </resources>
<plugins> <plugin>
- <groupId>org.freehep</groupId> - <artifactId>freehep-jas-plugin</artifactId> - <version>3.1.6</version> - <configuration> - <urls> - <property> - <name>org.lcsim:*</name> - <value>http://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/</value> - </property> - </urls> - <redirectUrls> - <property> - <name>http://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/</name> - <value>http://srs.slac.stanford.edu/nexus/service/local/artifact/maven/redirect?r=lcsim-maven2-public</value> - </property> - </redirectUrls> - <excludes> - <exclude>org.freehep:jas-core</exclude> - <exclude>junit:junit</exclude> - <exclude>org.freehep:freehep-application</exclude> - <exclude>org.netbeans:openide-lookup</exclude> - <exclude>jdom:jdom</exclude> - <exclude>javax.help:javahelp</exclude> - </excludes> - </configuration> - <executions> - <execution> - <goals> - <goal>install</goal> - </goals> - </execution> - <execution> - <id>process-descriptor</id> - <goals> - <goal>process-descriptor</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>1.3.3</version>
@@ -105,9 +56,19 @@
<dependency> <groupId>org.lcsim</groupId> <artifactId>lcsim-aida</artifactId>
+ <exclusions> + <exclusion> + <groupId>hep.aida</groupId> + <artifactId>aida-test</artifactId> + </exclusion> + </exclusions>
</dependency> <dependency> <groupId>org.lcsim</groupId>
+ <artifactId>lcsim-analysis</artifactId> + </dependency> + <dependency> + <groupId>org.lcsim</groupId>
<artifactId>lcsim-conditions</artifactId> </dependency> <dependency>
@@ -132,10 +93,6 @@
</dependency> <dependency> <groupId>org.lcsim</groupId>
- <artifactId>lcsim-plugin</artifactId> - </dependency> - <dependency> - <groupId>org.lcsim</groupId>
<artifactId>lcsim-tracking</artifactId> </dependency> <dependency>
@@ -166,38 +123,6 @@
<groupId>org.lcsim</groupId> <artifactId>lcsim-detector-data</artifactId> </dependency>
- <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-analysis</artifactId> - </dependency>
</dependencies>
- - <profiles> - <profile> - <id>submit-plugin-descriptor</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-jas-plugin</artifactId> - <executions> - <execution> - <id>submit-descriptor</id> - <goals> - <goal>submit-descriptor</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -
+
</project>
--- projects/lcsim/trunk/plugin/pom.xml 2014-02-10 23:42:31 UTC (rev 2971) +++ projects/lcsim/trunk/plugin/pom.xml 2014-02-10 23:43:44 UTC (rev 2972) @@ -3,45 +3,110 @@
<modelVersion>4.0.0</modelVersion> <artifactId>lcsim-plugin</artifactId> <name>plugin</name>
- <description>JAS plugin</description> -
+ <description>org.lcsim JAS3 Plugin</description> +
<parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <version>3.0.3-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent>
-
+
<scm>
- <url>http://java.freehep.org/svn/repos/lcdet/list/projects/lcsim/trunk/parent/</url> - <connection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/parent/</connection> - <developerConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/parent/</developerConnection>
+ <url>http://java.freehep.org/svn/repos/lcdet/list/projects/lcsim/trunk/plugin/</url> + <connection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/plugin/</connection> + <developerConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/plugin/</developerConnection>
</scm>
-
+
<dependencies> <dependency> <groupId>org.lcsim</groupId>
- <artifactId>lcsim-event-processing</artifactId>
+ <artifactId>lcsim-distribution</artifactId>
+ <type>pom</type>
</dependency>
- <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-conditions</artifactId> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>jas-core</artifactId> - <version>3.0.2</version> - <exclusions> - <exclusion> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-record</artifactId> - </dependency>
</dependencies>
-
+ + <build> + <resources> + <resource> + <directory>${basedir}/src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/plugins.xml</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.freehep</groupId> + <artifactId>freehep-jas-plugin</artifactId> + <version>3.1.6</version> + <configuration> + <urls> + <property> + <name>org.lcsim:*</name> + <value>http://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/</value> + </property> + </urls> + <redirectUrls> + <property> + <name>http://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/</name> + <value>http://srs.slac.stanford.edu/nexus/service/local/artifact/maven/redirect?r=lcsim-maven2-public</value> + </property> + </redirectUrls> + <excludes> + <exclude>junit:junit</exclude> + <exclude>jdom:jdom</exclude> + <exclude>org.freehep:jas-core</exclude> + <exclude>org.freehep:freehep-application</exclude> + <exclude>org.freehep:freehep-record</exclude> + <exclude>org.netbeans:openide-lookup</exclude> + <exclude>javax.help:javahelp</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>install</goal> + </goals> + </execution> + <execution> + <id>process-descriptor</id> + <goals> + <goal>process-descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>submit-plugin-descriptor</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.freehep</groupId> + <artifactId>freehep-jas-plugin</artifactId> + <executions> + <execution> + <id>submit-descriptor</id> + <goals> + <goal>submit-descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +
</project>
--- projects/lcsim/trunk/plugin/src/main/resources/PLUGIN-inf/plugins.xml (rev 0) +++ projects/lcsim/trunk/plugin/src/main/resources/PLUGIN-inf/plugins.xml 2014-02-10 23:43:44 UTC (rev 2972) @@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE plugins SYSTEM "http://java.freehep.org/schemas/plugin/1.1/plugin.dtd"> + +<plugins> + <plugin> + <information> + <name>org.lcsim</name> + <category>hep.linearcollider</category> + <author>LCSim Team</author> + <version>${project.version}</version> + <description kind="short">${project.description}</description> + <description>${project.description}</description> + <load-at-start/> + </information> + <resources> + <j2se minVersion="1.5"/> + <application minVersion="3.0.0"/> + <depends plugin="JAS 3 AIDA Plugin" minVersion="3.3.5" /> + <depends plugin="JAS 3 Compiler plugin" minVersion="1.2.4" /> + <depends plugin="JAS 3 Graphics IO" minVersion="1.2.3" /> + <depends plugin="JAS 3 JMinuit Fitter" minVersion="1.0.3" /> + <depends plugin="JAS 3 Record Loop" minVersion="2.1.1" /> + <depends plugin="JAS 3 Root Plugin" minVersion="4.6.3" /> + <depends plugin="JAS 3 Simple Editor" minVersion="1.2.4" /> + </resources> + <plugin-desc class="org.lcsim.plugin.LCSimPlugin"/> + </plugin> +</plugins>
--- projects/lcsim/trunk/pom.xml 2014-02-10 23:42:31 UTC (rev 2971) +++ projects/lcsim/trunk/pom.xml 2014-02-10 23:43:44 UTC (rev 2972) @@ -1,22 +1,25 @@
-<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project> +
<modelVersion>4.0.0</modelVersion> <groupId>org.lcsim</groupId> <artifactId>lcsim</artifactId> <packaging>pom</packaging> <name>lcsim</name>
- <description>lcsim project</description>
+ <description>org.lcsim Java framework</description> +
<parent> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId> <relativePath>./parent/pom.xml</relativePath> <version>3.0.3-SNAPSHOT</version> </parent>
+
<scm> <url>http://java.freehep.org/svn/repos/lcdet/list/projects/lcsim/trunk/</url> <connection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/</connection> <developerConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/</developerConnection> </scm>
+
<modules> <module>parent</module> <module>util</module>
@@ -30,13 +33,14 @@
<module>tracking</module> <module>vertexing</module> <module>event-heprep</module>
- <module>plugin</module>
<module>recon-drivers</module> <module>cal-recon</module> <module>cal-calib</module> <module>trf</module> <module>detector-data</module>
+ <module>analysis</module>
<module>distribution</module>
- <module>analysis</module>
+ <module>plugin</module>
</modules>
+
</project>
Use REPLY-ALL to reply to list
To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1