incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1372201 - in /incubator/easyant/plugins/trunk/jetty-deploy/src: main/resources/jetty-deploy.ant test/ test/antunit/ test/antunit/jetty-deploy-test.xml test/antunit/sample-module.ivy
Date Sun, 12 Aug 2012 21:44:37 GMT
Author: jlboudart
Date: Sun Aug 12 21:44:36 2012
New Revision: 1372201

URL: http://svn.apache.org/viewvc?rev=1372201&view=rev
Log:
Update jetty-run plugin with tests

Added:
    incubator/easyant/plugins/trunk/jetty-deploy/src/test/
    incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/
    incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml
    incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy
Modified:
    incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant

Modified: incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant?rev=1372201&r1=1372200&r2=1372201&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant (original)
+++ incubator/easyant/plugins/trunk/jetty-deploy/src/main/resources/jetty-deploy.ant Sun Aug
12 21:44:36 2012
@@ -29,7 +29,7 @@
 
         <fail unless="jetty.available" message="Jetty is unavailable!" />
 
-        <taskdef name="jetty" classname="org.mortbay.jetty.ant.JettyRunTask" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath"
/>
+        <taskdef resource="tasks.properties" classpathref="org.apache.easyant.plugins#jetty-deploy.classpath"
loaderref="jetty.loader"/>
     </target>
 
     <!-- default way jetty will be run:
@@ -37,8 +37,8 @@
         jetty configuration xml: jetty.xml shipped with this module (standard 6.1.4 jetty.xml
shipped with jetty) 
         webapplication context: root (/)
     -->
-    <target name="jetty-deploy:run" depends="package-war:war" description="run your webapp
inside a jetty application server">
-        <echo message="Deploying ${module.name} on Jetty .." />
+    <target name="jetty-deploy:run" depends="jetty-deploy:init,package-war:war" description="run
your webapp inside a jetty application server">
+        <echo message="Deploying ${module.name} on Jetty ..." />
         <jetty tempDirectory="${jetty.temp.dir}" jettyXml="${jetty.xml}">
             <webApp name="${module.name}" warfile="${target.artifacts}/${target.artifacts.main.war.name}"
contextpath="${jetty.context}" />
         </jetty>

Added: incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml?rev=1372201&view=auto
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml (added)
+++ incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/jetty-deploy-test.xml Sun
Aug 12 21:44:36 2012
@@ -0,0 +1,67 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="org.apache.easyant.plugins;jetty-deploy-test" 
+    xmlns:ac="antlib:net.sf.antcontrib"
+    xmlns:au="antlib:org.apache.ant.antunit" 
+    xmlns:ivy="antlib:org.apache.ivy.ant"
+    xmlns:ea="antlib:org.apache.easyant">
+    
+    <!-- Import your plugin --> 
+    <property name="target" value="${basedir}/target/test-antunit"/>
+    <!-- configure easyant in current project -->
+    <ea:configure-easyant-ivy-instance />
+    <!-- import our local plugin -->
+    <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"/>
+
+    <!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->

+    <target name="clean" description="remove stale build artifacts before / after each
test">
+        <delete dir="${basedir}" includeemptydirs="true">
+            <include name="**/target/**"/>
+            <include name="**/lib/**"/>
+        </delete>
+    </target>
+    
+    <target name="setUp" depends="clean">
+      <property name="ivy.local.default.root" value="${target}/local-repo"/>
+      <property name="ivy.shared.default.root" value="${target}/shared-repo"/>
+      <property name="project.ivy.file" value="sample-module.ivy"/>
+      <ivy:settings id="project.ivy.instance"/>
+      <ivy:resolve file="${project.ivy.file}" settingsRef="project.ivy.instance"/>
+      <mkdir dir="${target}/artifacts"/>
+      <echo file="${target}/artifacts/standard-java-app.jar"/>
+      <property name="manifest.file" value="${target}/MANIFEST.MF"/>
+      <echo file="${manifest.file}"/>
+
+    </target>
+    <target name="tearDown" depends="clean"/>
+    
+    <target name="test-jetty-deploy:init" depends="jetty-deploy:init">
+        <au:assertPropertyEquals name="jetty.temp.dir" value="${target}/jetty-temp"/>
+        <au:assertFalse>
+            <isset property="jetty.xml" />
+        </au:assertFalse>
+        <au:assertPropertyEquals name="jetty.context" value="/"/>
+        <au:assertPropertyEquals name="jetty.available" value="true"/>
+   </target>
+
+   <target name="test-jetty-deploy:run">
+          <!--TODO : don't know yet how to test this target -->
+          <!--
+            <antcall target="jetty-deploy:run"/>
+          -->
+   </target>
+</project>

Added: incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy?rev=1372201&view=auto
==============================================================================
--- incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy (added)
+++ incubator/easyant/plugins/trunk/jetty-deploy/src/test/antunit/sample-module.ivy Sun Aug
12 21:44:36 2012
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+    <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1"
status="integration"/>
+
+</ivy-module>



Mime
View raw message