From 064aebf9108b61d667a2e99d93b3cd83b9c3d312 Mon Sep 17 00:00:00 2001 From: kelvingoodson Date: Fri, 26 Feb 2010 13:50:24 +0000 Subject: fixing to mirror sample-store-webapp changes git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@916681 13f79535-47bb-0310-9956-ffa450edef68 --- sandbox/kgoodson/jagg-webapp/build.xml | 79 --------- sandbox/kgoodson/jagg-webapp/pom.xml | 180 +++------------------ .../jagg-webapp/src/main/resources/plan.composite | 9 +- .../jagg-webapp/src/main/resources/plan.html | 150 ----------------- .../src/main/webapp/META-INF/sca-contribution.xml | 6 +- .../jagg-webapp/src/main/webapp/WEB-INF/plan.html | 150 +++++++++++++++++ .../jagg-webapp/src/main/webapp/WEB-INF/web.xml | 2 +- 7 files changed, 183 insertions(+), 393 deletions(-) delete mode 100644 sandbox/kgoodson/jagg-webapp/build.xml delete mode 100644 sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html create mode 100644 sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html (limited to 'sandbox/kgoodson/jagg-webapp') diff --git a/sandbox/kgoodson/jagg-webapp/build.xml b/sandbox/kgoodson/jagg-webapp/build.xml deleted file mode 100644 index e186df80e8..0000000000 --- a/sandbox/kgoodson/jagg-webapp/build.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sandbox/kgoodson/jagg-webapp/pom.xml b/sandbox/kgoodson/jagg-webapp/pom.xml index 69e7fca7cd..ecf8d2fab2 100644 --- a/sandbox/kgoodson/jagg-webapp/pom.xml +++ b/sandbox/kgoodson/jagg-webapp/pom.xml @@ -29,115 +29,19 @@ Apache Tuscany SCA Sample JIRA Aggregator war - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - - - org.codehaus.mojo - jaxb2-maven-plugin - 1.3 - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - generate-sources - - copy - - - - - javax.xml.bind - jaxb-api - 2.1 - jar - - - ${project.build.directory}/endorsed - false - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - -Djava.endorsed.dirs=target/endorsed - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.0 - - - - add-source - generate-sources - - add-source - - - - target/jaxb-source - - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.7.1 - - - generate-jaxb - generate-sources - - generate - - - - - com.example.ipo.jaxb - ${project.build.directory}/jaxb-source - ${basedir}/src/main/resources - - - JiraSideband.xsd - JiraRSS.xsd - - - - - - ${artifactId} - org.apache.tuscany.sca - tuscany-node-impl + jagg-logic + 2.0-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-host-webapp 2.0-SNAPSHOT @@ -189,24 +93,10 @@ runtime - - org.apache.tuscany.sca - tuscany-binding-http-runtime - 2.0-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-jetty - 2.0-SNAPSHOT - runtime - - junit junit - 4.5 + 4.8.1 test @@ -214,52 +104,30 @@ rome 1.0 - - javax.xml.bind - jaxb-api - 2.0 - - - com.sun.xml.bind - jaxb-impl - 2.0.3 - - - org.jvnet.jaxb2_commons - runtime - 0.4.1 - - - org.apache.tuscany.sca - tuscany-binding-http-runtime - 2.0-SNAPSHOT - runtime - - - org.apache.tuscany.sca - tuscany-host-jetty - 2.0-SNAPSHOT - runtime - - - net.sourceforge.htmlunit - htmlunit - 2.6 - test - - - org.jvnet.jaxb2_commons - testing - 0.4.1 - test - + + ${artifactId} + + + org.codehaus.mojo + tomcat-maven-plugin + 1.0-beta-1 + + + + tomcat + + /${artifactId} + + + + diff --git a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite index c6f837c0d2..dbff8c905f 100644 --- a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite +++ b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite @@ -24,16 +24,17 @@ - - - + + + + src/main/resources/jiraSideBand.xml - + diff --git a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html deleted file mode 100644 index f064b47160..0000000000 --- a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html +++ /dev/null @@ -1,150 +0,0 @@ - - - -Plan - - - - - - - - -

Plan

- - - - - -
-
- - - - -
-
-
- Add New Milestone -
- -
-
-
- - \ No newline at end of file diff --git a/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml index 9d874181fe..8122539244 100644 --- a/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml +++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> - - + + \ No newline at end of file diff --git a/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html new file mode 100644 index 0000000000..f064b47160 --- /dev/null +++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html @@ -0,0 +1,150 @@ + + + +Plan + + + + + + + + +

Plan

+ + + + + +
+
+ + + + +
+
+
+ Add New Milestone +
+ +
+
+
+ + \ No newline at end of file diff --git a/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml index 9c8eb81ae4..ecf656d929 100644 --- a/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml @@ -18,7 +18,7 @@ * under the License. --> - sample-jagg-secure-webapp + sample-jagg-webapp tuscany -- cgit v1.2.3