ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1600490 - in /ctakes/trunk: ctakes-distribution/pom.xml ctakes-distribution/src/main/assembly/bin.xml ctakes-ytex-web/pom.xml pom.xml
Date Wed, 04 Jun 2014 20:45:59 GMT
Author: chenpei
Date: Wed Jun  4 20:45:58 2014
New Revision: 1600490

URL: http://svn.apache.org/r1600490
Log:
CTAKES-253 CTAKES-292 - Integrate YTEX with cTAKES
1)	Removed <finalName> from ctakes-ytex-web.  This caused the jars to be called ctakes-ytex-web.jar
instead of the  default ctakes-ytex-web-{version}.jar.  Which will make downstream modules
fail to recognize this if added as a dependency.
2)	Removed the custom make-jar inside ctakes-ytext-web.  Use built-in attachClasses attribute
from war plugin instead.
a.	My guess is that you would like to jar all of the classes as well as have a war file. 
If true, then there is a feature already built-in for this.  I noticed there are other xml
properties included in the classes.  Let me know if there was still a specific reason for
the custom jar that I may have overlooked.
                     <plugin>
                         <artifactId>maven-war-plugin</artifactId>
                         <version>2.4</version>
                         <configuration>
                             <attachClasses>true</attachClasses>
                         </configuration>
</plugin>
                By doing this, other modules can now depend on this by simply including the
classes classifier.  For example, in the distribution module:
              <dependency>
                     <groupId>org.apache.ctakes</groupId>
                     <artifactId>ctakes-ytex-web</artifactId>
                     <version>${project.version}</version>
                     <classifier>classes</classifier>
              </dependency> 

Modified:
    ctakes/trunk/ctakes-distribution/pom.xml
    ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml
    ctakes/trunk/ctakes-ytex-web/pom.xml
    ctakes/trunk/pom.xml

Modified: ctakes/trunk/ctakes-distribution/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-distribution/pom.xml?rev=1600490&r1=1600489&r2=1600490&view=diff
==============================================================================
--- ctakes/trunk/ctakes-distribution/pom.xml (original)
+++ ctakes/trunk/ctakes-distribution/pom.xml Wed Jun  4 20:45:58 2014
@@ -123,8 +123,8 @@
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
 			<artifactId>ctakes-ytex-web</artifactId>
-			<type>jar</type>
 			<version>${project.version}</version>
+			<classifier>classes</classifier>
 		</dependency>						
 	</dependencies>
 

Modified: ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml?rev=1600490&r1=1600489&r2=1600490&view=diff
==============================================================================
--- ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml (original)
+++ ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml Wed Jun  4 20:45:58 2014
@@ -58,6 +58,7 @@
 				<include>org.apache.ctakes:ctakes-utils</include>
 				<include>org.apache.ctakes:ctakes-ytex</include>
 				<include>org.apache.ctakes:ctakes-ytex-uima</include>
+				<include>org.apache.ctakes:ctakes-ytex-web</include>				
 			</includes>
 			
             <excludes>

Modified: ctakes/trunk/ctakes-ytex-web/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-ytex-web/pom.xml?rev=1600490&r1=1600489&r2=1600490&view=diff
==============================================================================
--- ctakes/trunk/ctakes-ytex-web/pom.xml (original)
+++ ctakes/trunk/ctakes-ytex-web/pom.xml Wed Jun  4 20:45:58 2014
@@ -166,7 +166,6 @@
 				</excludes>
 			</testResource>
 		</testResources>
-		<finalName>ctakes-ytex-web</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
@@ -219,48 +218,12 @@
 				<include>**/integration/*Test.java </include> </includes> </configuration>

 				</execution> </executions> </plugin> -->
 			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-a-jar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.artifactId}-${project.version}</finalName>
-							<includes>
-								<!-- Resources will be copied by the assembly No need for it to be 
-									inside the jar -->
-								<include>**/*.class</include>
-								<include>**/META-INF/**</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>install-file</goal>
-						</goals>
-						<configuration>
-							<packaging>jar</packaging>
-							<artifactId>${project.artifactId}</artifactId>
-							<groupId>${project.groupId}</groupId>
-							<version>${project.version}</version>
-							<file>
-								${project.build.directory}/${project.artifactId}-${project.version}.jar
-							</file>
-						</configuration>
-					</execution>
-				</executions>
+			    <artifactId>maven-war-plugin</artifactId>
+			    <version>2.4</version>
+			    <configuration>
+			        <attachClasses>true</attachClasses>
+			    </configuration>
 			</plugin>
 		</plugins>
-
 	</build>
 </project>

Modified: ctakes/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/pom.xml?rev=1600490&r1=1600489&r2=1600490&view=diff
==============================================================================
--- ctakes/trunk/pom.xml (original)
+++ ctakes/trunk/pom.xml Wed Jun  4 20:45:58 2014
@@ -394,7 +394,15 @@
 				<artifactId>
 					ctakes-ytex-uima
 				</artifactId>
-				<version>${ctakes.version}</version>			</dependency>			
+				<version>${ctakes.version}</version>
+			</dependency>			
+			<dependency>
+				<groupId>org.apache.ctakes</groupId>
+				<artifactId>
+					ctakes-ytex-web
+				</artifactId>
+				<version>${ctakes.version}</version>
+			</dependency>			
 			<dependency>
 				<groupId>org.apache.ctakes</groupId>
 				<artifactId>
@@ -691,10 +699,11 @@
 					<configuration>
 			          <includes>
 			          <!-- Resources will be copied by the assembly
-			          No need for it to be inside the jar -->
+			          No need for it to be inside the jar 
 			            <include>**/*.class</include>
 			            <include>**/types/*.xml</include>			            
 			            <include>**/META-INF/**</include>
+			            -->
 			          </includes>
 	        		</configuration>
 				</plugin>



Mime
View raw message