Print

Print


Commit in lcsim on MAIN
pom.xml+62-311.34 -> 1.35
JM: add service file generation back to pom; add lcsim.org/maven2 as plugin repository so plugins are downloaded

lcsim
pom.xml 1.34 -> 1.35
diff -u -r1.34 -r1.35
--- pom.xml	5 Sep 2008 00:08:28 -0000	1.34
+++ pom.xml	10 Sep 2008 22:02:55 -0000	1.35
@@ -11,8 +11,8 @@
         <connection>scm:cvs:pserver:anonymous:@cvs.freehep.org:/cvs/lcd:lcsim</connection>
         <developerConnection>scm:cvs:pserver:${username}:@cvs.freehep.org:/cvs/lcd:lcsim</developerConnection>
         <url>http://source.freehep.org/jcvsweb/ilc/LCSIM/list/lcsim</url>
-   </scm>             
-   <repositories>
+    </scm>             
+    <repositories>
         <repository>
             <id>lcsim-maven</id>
             <name>org.lcsim Maven Repository</name>
@@ -23,18 +23,30 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </snapshots>
         </repository>
-   </repositories>
-   <parent>
-       <groupId>org.lcsim</groupId>
-       <artifactId>lcsim-parent</artifactId>
-       <version>1.1-SNAPSHOT</version>
-   </parent>
-   <distributionManagement>
-       <site>
-           <id>org.lcsim</id>
-           <name>org.lcsim</name>
-           <url>scp://noric.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/software/lcsim/</url>
-       </site>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>lcsim-maven-plugin</id>
+            <name>org.lcsim Maven Plugin Repository</name>
+            <url>http://lcsim.org/maven2</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+    <parent>
+        <groupId>org.lcsim</groupId>
+        <artifactId>lcsim-parent</artifactId>
+        <version>1.1-SNAPSHOT</version>
+    </parent>
+    <distributionManagement>
+        <site>
+            <id>org.lcsim</id>
+            <name>org.lcsim</name>
+            <url>scp://noric.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/software/lcsim/</url>
+        </site>
     </distributionManagement>
     <build>
         <resources>
@@ -43,10 +55,10 @@
                 <includes>
                     <include>org/lcsim/plugin/web/examples/</include>
                 </includes>
-           </resource>
-           <resource>
-               <directory>resources</directory>
-           </resource>
+            </resource>
+            <resource>
+                <directory>resources</directory>
+            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -62,13 +74,13 @@
                 </executions>
                 <configuration>
                     <jarName>lcsim</jarName>
-                        <includes>
-                            <include>org.freehep:freehep-physics</include>
-                            <include>org.freehep:freehep-sio</include>
-                            <include>org.lcsim:GeomConverter</include>
-                            <include>xerces:xercesImpl</include>
-                            <include>commons-math:commons-math</include>
-                        </includes>
+                    <includes>
+                        <include>org.freehep:freehep-physics</include>
+                        <include>org.freehep:freehep-sio</include>
+                        <include>org.lcsim:GeomConverter</include>
+                        <include>xerces:xercesImpl</include>
+                        <include>commons-math:commons-math</include>
+                    </includes>
                 </configuration>
             </plugin>      
             <plugin>
@@ -101,7 +113,26 @@
                     </excludes>
                 </configuration>
             </plugin>
-            <!-- Generate a run script for use on this system -->
+            <!-- Driver service file -->
+            <plugin>
+                <groupId>org.lcsim</groupId>
+                <artifactId>maven-service-plugin</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <id>generate-service-file</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>generate-service-file</goal>
+                        </goals>
+                        <configuration>
+                            <className>org.lcsim.util.Driver</className>
+                            <outputDirectory>${basedir}/resources/META-INF/services/</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- local run script -->
             <plugin>
                 <groupId>org.lcsim</groupId>
                 <artifactId>run-script-maven-plugin</artifactId>
@@ -120,7 +151,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- Generates jar with classpath in manifest -->
+            <!-- jar with classpath in manifest -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -134,7 +165,7 @@
                     </archive>
                 </configuration>
             </plugin>
-            <!-- Generates zip file with all deps -->
+            <!-- zip file with all deps -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
@@ -151,7 +182,7 @@
                     </execution> 
                 </executions>
             </plugin>
-            <!-- Unzips all deps to lib -->
+            <!-- unzip all deps to lib dir -->
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.1</version>
@@ -174,11 +205,11 @@
     <dependencies>
         <!-- LCDetectors Conditions Database -->
         <!--
-        <dependency>
+            <dependency>
             <groupId>org.lcsim</groupId>
             <artifactId>lcsim-detectors</artifactId>
             <version>1.0-SNAPSHOT</version>
-        </dependency>
+            </dependency>
         -->
         <!-- Geometry Converter -->
         <dependency>
CVSspam 0.2.8