| Commit in java/trunk on MAIN |
| distribution/pom.xml | +1 | -85 | 212 -> 213 |
| parent/pom.xml | +4 | -3 | 212 -> 213 |
| plugin/pom.xml | +150 | | added 213 |
| plugin/src/main/java/org/hps/plugin/HPSPlugin.java | +12 | | added 213 |
| plugin/src/main/resources/PLUGIN-inf/plugins.xml | +23 | | added 213 |
| pom.xml | +1 | | 212 -> 213 |
| +191 | -88 | |
3 added + 3 modified, total 6 files
java/trunk/distribution
--- java/trunk/distribution/pom.xml 2014-02-10 17:55:09 UTC (rev 212)
+++ java/trunk/distribution/pom.xml 2014-02-11 00:38:18 UTC (rev 213)
@@ -22,62 +22,9 @@
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/distribution/</developerConnection>
</scm>
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/plugins.xml</include>
- </includes>
- </resource>
- </resources>
+ <build>
<plugins>
<plugin>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-jas-plugin</artifactId>
- <version>3.1.6</version>
- <configuration>
- <urls>
- <property>
- <name>org.hps:*</name>
- <value>http://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/</value>
- </property>
- <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>
<executions>
@@ -121,46 +68,15 @@
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-java</artifactId>
- <version>3.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-users</artifactId>
- <version>3.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-monitoring-app</artifactId>
- <version>3.0.1-SNAPSHOT</version>
</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>
java/trunk/parent
--- java/trunk/parent/pom.xml 2014-02-10 17:55:09 UTC (rev 212)
+++ java/trunk/parent/pom.xml 2014-02-11 00:38:18 UTC (rev 213)
@@ -245,10 +245,10 @@
<execution>
<phase>generate-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<!-- Create the directory for test output. -->
<mkdir dir="${project.build.directory}/test-output" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -272,6 +272,7 @@
<organizationUrl>http://www.slac.stanford.edu/</organizationUrl>
<roles>
<role>developer</role>
+ <role>release manager</role>
</roles>
<timezone>-8</timezone>
<properties>
@@ -284,7 +285,7 @@
<organization>Thomas Jefferson National Accelerator Laboratory</organization>
<organizationUrl>http://www.jlab.org/</organizationUrl>
<roles>
- <role>mad scientist</role>
+ <role>developer</role>
</roles>
<timezone>-5</timezone>
<properties>
java/trunk/plugin
--- java/trunk/plugin/pom.xml (rev 0)
+++ java/trunk/plugin/pom.xml 2014-02-11 00:38:18 UTC (rev 213)
@@ -0,0 +1,150 @@
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>hps-plugin</artifactId>
+ <name>plugin</name>
+ <description>HPS JAS3 Plugin</description>
+
+ <parent>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-parent</artifactId>
+ <relativePath>../parent/pom.xml</relativePath>
+ <version>3.0.1-SNAPSHOT</version>
+ </parent>
+
+ <scm>
+ <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/plugin/</url>
+ <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/plugin/</connection>
+ <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/plugin/</developerConnection>
+ </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.hps:*</name>
+ <value>http://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/</value>
+ </property>
+ <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.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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
+ <shadedClassifierName>bin</shadedClassifierName>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.lcsim.job.JobControlManager</mainClass>
+ </transformer>
+ </transformers>
+ <artifactSet>
+ <excludes>
+ <exclude>hep.testdata.aida:*</exclude>
+ </excludes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-distribution</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>
java/trunk/plugin/src/main/java/org/hps/plugin
--- java/trunk/plugin/src/main/java/org/hps/plugin/HPSPlugin.java (rev 0)
+++ java/trunk/plugin/src/main/java/org/hps/plugin/HPSPlugin.java 2014-02-11 00:38:18 UTC (rev 213)
@@ -0,0 +1,12 @@
+package org.hps.plugin;
+
+import org.freehep.application.studio.Plugin;
+
+/**
+ *
+ * @author Jeremy McCormick
+ * @version $Id: HPSPlugin.java,v 1.1 2013/06/03 16:23:47 jeremy Exp $
+ */
+
+public class HPSPlugin extends Plugin
+{}
java/trunk/plugin/src/main/resources/PLUGIN-inf
--- java/trunk/plugin/src/main/resources/PLUGIN-inf/plugins.xml (rev 0)
+++ java/trunk/plugin/src/main/resources/PLUGIN-inf/plugins.xml 2014-02-11 00:38:18 UTC (rev 213)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE plugins SYSTEM "http://java.freehep.org/schemas/plugin/1.1/plugin.dtd">
+
+<plugins>
+ <plugin>
+ <information>
+ <name>HPS Java</name>
+ <category>hep.hps</category>
+ <author>HPS Java team</author>
+ <version>${project.version}</version>
+ <description kind="short">${project.description}</description>
+ <description>${project.description}</description>
+ <load-at-start />
+ </information>
+ <resources>
+ <j2se minVersion="1.7" />
+ <application minVersion="3.0.0" />
+ <depends plugin="org.lcsim" minVersion="${lcsimVersion}" />
+ </resources>
+ <plugin-desc class="org.hps.plugin.HPSPlugin" />
+ </plugin>
+</plugins>
java/trunk
--- java/trunk/pom.xml 2014-02-10 17:55:09 UTC (rev 212)
+++ java/trunk/pom.xml 2014-02-11 00:38:18 UTC (rev 213)
@@ -32,6 +32,7 @@
<module>monitoring-app</module>
<module>users</module>
<module>distribution</module>
+ <module>plugin</module>
</modules>
</project>
SVNspam 0.1
