You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/09/29 23:20:03 UTC

svn commit: r451447 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4: pom.xml src/main/resources/org/apache/cayenne/cayenne-strings.properties

Author: aadamchik
Date: Fri Sep 29 14:20:02 2006
New Revision: 451447

URL: http://svn.apache.org/viewvc?view=rev&rev=451447
Log:
CAY-662

Modified:
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/org/apache/cayenne/cayenne-strings.properties

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml?view=diff&rev=451447&r1=451446&r2=451447
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml Fri Sep 29 14:20:02 2006
@@ -148,8 +148,24 @@
 	</dependencies>
 
 	<build>
-		<plugins>
+		<resources>
+			<!-- don't filter dotemplates -->
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>dotemplates/**</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>dotemplates/**</include>
+				</includes>
+			</resource>
+		</resources>
 
+		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -158,41 +174,41 @@
 					<target>1.4</target>
 				</configuration>
 			</plugin>
-<!--  
-			<plugin>
+			<!--  
+				<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>javacc-maven-plugin</artifactId>
 				<executions>
-					<execution>
-						<id>jjtree</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>jjtree</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>
-								${basedir}/target/generated-sources/javacc/org/apache/cayenne/ejbql
-							</outputDirectory>
-						</configuration>
-					</execution>
-					<execution>
-						<id>javacc</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>javacc</goal>
-						</goals>
-						<configuration>
-							<sourceDirectory>
-								${basedir}/target/generated-sources/javacc/org/apache/cayenne/ejbql
-							</sourceDirectory>
-							<outputDirectory>
-								${basedir}/target/generated-sources/javacc/org/apache/cayenne/ejbql
-							</outputDirectory>
-						</configuration>
-					</execution>
+				<execution>
+				<id>jjtree</id>
+				<phase>generate-sources</phase>
+				<goals>
+				<goal>jjtree</goal>
+				</goals>
+				<configuration>
+				<outputDirectory>
+				${basedir}/target/generated-sources/javacc/org/apache/cayenne/ejbql
+				</outputDirectory>
+				</configuration>
+				</execution>
+				<execution>
+				<id>javacc</id>
+				<phase>generate-sources</phase>
+				<goals>
+				<goal>javacc</goal>
+				</goals>
+				<configuration>
+				<sourceDirectory>
+				${basedir}/target/generated-sources/javacc/org/apache/cayenne/ejbql
+				</sourceDirectory>
+				<outputDirectory>
+				${basedir}/target/generated-sources/javacc/org/apache/cayenne/ejbql
+				</outputDirectory>
+				</configuration>
+				</execution>
 				</executions>
-			</plugin>
--->
+				</plugin>
+			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/org/apache/cayenne/cayenne-strings.properties
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/org/apache/cayenne/cayenne-strings.properties?view=diff&rev=451447&r1=451446&r2=451447
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/org/apache/cayenne/cayenne-strings.properties (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/resources/org/apache/cayenne/cayenne-strings.properties Fri Sep 29 14:20:02 2006
@@ -1,2 +1,5 @@
-cayenne.version = @CAYENNE_VERSION@
-cayenne.build.date = @CAYENNE_BUILD_DATE@
\ No newline at end of file
+cayenne.version = ${project.version}
+
+# there is no timnestamp property in the Maven environment as of 2.0.4
+#cayenne.build.date = @CAYENNE_BUILD_DATE@
+cayenne.build.date = 
\ No newline at end of file