velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r959759 - in /velocity/sandbox/maven-reorg/engine/trunk: velocity-engine-assembly/ velocity-engine-core/ velocity-engine-core/src/main/java/org/apache/velocity/runtime/log/ velocity-engine-servlet/ velocity-engine-servlet/src/main/java/org/...
Date Thu, 01 Jul 2010 19:39:49 GMT
Author: apetrelli
Date: Thu Jul  1 19:39:48 2010
New Revision: 959759

URL: http://svn.apache.org/viewvc?rev=959759&view=rev
Log:
VELOCITYSB-4
Moved code to velocity-engine-servlet.
Prepared for aggregated javadocs and packaging assembly.

Added:
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/velocity/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/velocity/runtime/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/velocity/runtime/log/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/velocity/runtime/log/ServletLogChute.java
      - copied unchanged from r959747, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/log/ServletLogChute.java
Removed:
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/log/ServletLogChute.java
Modified:
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/pom.xml
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml?rev=959759&r1=959758&r2=959759&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml Thu Jul  1
19:39:48 2010
@@ -60,4 +60,91 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.2-beta-5</version>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/bin.xml</descriptor>
+                            </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <mkdir
+                                            dir="${project.build.directory}/assemblies" />
+                                        <echo message="Here I am!" />
+                                        <copy
+                                            todir="${project.build.directory}/assemblies">
+                                            <fileset
+                                                dir="${settings.localRepository}/org/apache/velocity/velocity-assembly/${pom.version}">
+                                                <include
+                                                    name="velocity-assembly-${pom.version}-*.zip*"
/>
+                                                <include
+                                                    name="velocity-assembly-${pom.version}-*.tar.gz*"
/>
+                                            </fileset>
+                                            <mapper type="glob"
+                                                from="velocity-assembly-*"
+                                                to="velocity-*" />
+                                        </copy>
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>wagon-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>upload</goal>
+                                </goals>
+                                <configuration>
+                                    <fromDir>${project.build.directory}/assemblies</fromDir>
+                                    <includes>**</includes>
+                                    <toDir>${pom.version}</toDir>
+                                    <serverId>apache.build</serverId>
+                                    <url>scp://people.apache.org/www/people.apache.org/builds/velocity</url>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
\ No newline at end of file

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/pom.xml?rev=959759&r1=959758&r2=959759&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/pom.xml Thu Jul  1 19:39:48
2010
@@ -55,28 +55,16 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>logkit</groupId>
             <artifactId>logkit</artifactId>
             <version>2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.6</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-        	<groupId>junit</groupId>
-        	<artifactId>junit</artifactId>
-        	<version>3.8.1</version>
-        	<scope>test</scope>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>hsqldb</groupId>

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml?rev=959759&r1=959758&r2=959759&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml Thu Jul  1 19:39:48
2010
@@ -17,5 +17,10 @@
       <version>2.3</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+    	<groupId>org.apache.velocity</groupId>
+    	<artifactId>velocity-engine-core</artifactId>
+    	<version>2.0.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file



Mime
View raw message