General

From c6364b9aa6850577994224419364658595dd9b7b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 6 Jun 2009 12:55:25 +0000 Subject: [PATCH] First complete version of the site git-svn-id: https://svn.argeo.org/slc/trunk@2491 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- buildSite.sh | 4 + integration-tests/pom.xml | 20 +- pom.xml | 1090 ++++++++++++++++++++++- runtime/pom.xml | 49 +- runtime/src/site.xml | 15 - server/org.argeo.slc.ria/pom.xml | 59 +- server/org.argeo.slc.siteserver/pom.xml | 4 +- server/pom.xml | 4 +- src/site/apt/gettingStarted.apt | 3 + src/site/apt/index.apt | 7 + src/site/fml/faq.fml | 40 + src/site/site.xml | 34 + 12 files changed, 1214 insertions(+), 115 deletions(-) create mode 100755 buildSite.sh delete mode 100644 runtime/src/site.xml create mode 100644 src/site/apt/gettingStarted.apt create mode 100644 src/site/apt/index.apt create mode 100644 src/site/fml/faq.fml create mode 100644 src/site/site.xml diff --git a/buildSite.sh b/buildSite.sh new file mode 100755 index 000000000..2142b4a6e --- /dev/null +++ b/buildSite.sh @@ -0,0 +1,4 @@ +#!/bin/sh +rm -rf ~/dev/work/slcSite/0.11 +mvn clean install +mvn site-deploy -Pdeveloper diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index b1f28c619..e82d02400 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -10,7 +11,18 @@ integration-tests pom Argeo SLC Integration Tests - - org.argeo.slc.it.webapp - + + + withIT + + true + + + org.argeo.slc.it.webapp + + + + withoutIT + + diff --git a/pom.xml b/pom.xml index cd4d41b43..2d41c643e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,46 +1,1098 @@ 4.0.0 - - org.argeo.slc - argeo-slc - 0.11.4-SNAPSHOT - org.argeo.slc - - argeo-slc-all + org.argeo.slc + argeo-slc pom - Argeo SLC All + Argeo SLC + 0.11.4-SNAPSHOT - org.argeo.slc runtime + dep server demo + integration-tests + archetypes + + 0.11 + 2.5.6.A + 2.5.6.A + 1.5.5.A + 1.1.3.RELEASE + 2.0.9 + 1.7.0 + 6.1.14 + 6.0.18 + 3.4.2.R34x_v20080826-1230 + 2.0.0 + 5.2.0.0006 + 0.1.12 + file:///var/argeo/projects/SLC/www/site + http://www.argeo.org/projects/slc + + ${site.urlBase}/${developmentCycle} + + scm:svn:https://www.argeo.org/svn/slc/trunk + scm:svn:https://www.argeo.org/svn/slc/trunk + https://www.argeo.org/svn/slc/trunk + + + Bugzilla + https://www.argeo.org/bugzilla/ + + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + Argeo + http://www.argeo.org + + + + mbaudier + Mathieu Baudier + + Argeo + http://www.argeo.org + + architect + developer + QA + + +1 + + + cdujeu + Charles du Jeu + + Argeo + http://www.argeo.org + + developer + + +1 + + + ocapillo + Olivier Capillon + + Argeo + http://www.argeo.org + + developer + + +1 + + + + + Philippe Rioland + + CapCo + http://www.capco.com + + tester + sponsor + + 0 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar + + + + + + + org.mortbay.jetty + maven-jetty-plugin + ${version.jetty} + + org.argeo.slc.webapp + stopKey + 9091 + + + 9090 + 60000 + + + + + + org.hsqldb + + com.springsource.org.hsqldb + + 1.8.0.9 + + + org.mortbay.jetty + jetty-plus + ${version.jetty} + + + org.mortbay.jetty + jetty-naming + ${version.jetty} + + + org.apache.log4j + com.springsource.org.apache.log4j + 1.2.15 + + + javax.xml.soap + com.springsource.javax.xml.soap + 1.3.0 + + + javax.mail + com.springsource.javax.mail + 1.4.1 + + + + + org.argeo.slc.maven + maven-argeo-osgi-plugin + ${version.maven-argeo-osgi} + + + + + org.apache.maven.plugins + maven-resources-plugin + + UTF-8 + + + + org.apache.maven.plugins + maven-site-plugin + 2.0-beta-5 + + + + org.apache.maven.plugins maven-release-plugin true - fullBuild - deploy + release + deploy,site-deploy + + + + + + org.argeo.slc.runtime + org.argeo.slc.specs + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.launcher + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.detached + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.simple + ${project.version} + + + + org.argeo.slc.runtime + org.argeo.slc.support.hibernate + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.castor + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.activemq + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.server + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.osgiboot + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.support.equinox + ${project.version} + + + + org.argeo.slc.server + org.argeo.slc.ria + ${project.version} + + + + org.argeo.slc.server + deploy + ${project.version} + pom + + + + + org.argeo.slc.runtime + org.argeo.slc.detached.launcher + ${project.version} + tar.gz + dist + + + + + + javax.transaction + + com.springsource.javax.transaction + + 1.1.0 + + + javax.xml.stream + + com.springsource.javax.xml.stream + + 1.0.1 + + + javax.xml.soap + com.springsource.javax.xml.soap + 1.3.0 + + + com.sun.xml + + com.springsource.com.sun.xml.messaging.saaj + + 1.3.0 + + + javax.activation + + com.springsource.javax.activation + + 1.1.1 + + + javax.annotation + com.springsource.javax.annotation + 1.0.0 + + + javax.persistence + com.springsource.javax.persistence + 1.0.0 + + + javax.xml.ws + com.springsource.javax.xml.ws + 2.1.1 + + + javax.xml.bind + com.springsource.javax.xml.bind + 2.1.7 + + + + + org.junit + com.springsource.junit + 3.8.2 + + + org.dbunit + com.springsource.org.dbunit + 2.2.0 + + + + + org.apache.log4j + + com.springsource.org.apache.log4j + + 1.2.15 + + + org.apache.commons + + com.springsource.org.apache.commons.logging + + 1.1.1 + + + org.slf4j + com.springsource.slf4j.org.apache.commons.logging + 1.5.3 + + + org.slf4j + com.springsource.slf4j.jcl + 1.5.3 + + + org.slf4j + com.springsource.slf4j.org.apache.log4j + 1.5.3 + + + + + org.springframework + org.springframework.core + ${version.spring} + + + org.springframework + org.springframework.beans + ${version.spring} + + + org.springframework + org.springframework.context + ${version.spring} + + + org.springframework + + org.springframework.context.support + + ${version.spring} + + + org.springframework + org.springframework.orm + ${version.spring} + + + org.springframework + org.springframework.jdbc + ${version.spring} + + + org.springframework + org.springframework.transaction + ${version.spring} + + + org.springframework + org.springframework.web + ${version.spring} + + + org.springframework + org.springframework.web.servlet + ${version.spring} + + + org.springframework + org.springframework.aop + ${version.spring} + + + org.springframework + org.springframework.jms + ${version.spring} + + + + org.springframework.ws + org.springframework.oxm + ${version.spring-ws} + + + + org.springframework.osgi + org.springframework.osgi.extender + ${version.spring-osgi} + + + org.springframework.osgi + org.springframework.osgi.core + ${version.spring-osgi} + + + org.springframework.osgi + org.springframework.osgi.web.extender + ${version.spring-osgi} + + + org.springframework.osgi + org.springframework.osgi.web + ${version.spring-osgi} + + + org.springframework.osgi + org.springframework.osgi.test + ${version.spring-osgi} + + + org.argeo.slc.dep.osgi + org.argeo.dep.osgi.catalina.start + 1.0.0.argeo3 + + + + + org.aspectj + com.springsource.org.aspectj.runtime + 1.6.2.RELEASE + + + org.aspectj + com.springsource.org.aspectj.weaver + 1.6.2.RELEASE + + + org.aopalliance + com.springsource.org.aopalliance + 1.0.0 + + + net.sourceforge.cglib + com.springsource.net.sf.cglib + 2.1.3 + + + org.objectweb.asm + com.springsource.org.objectweb.asm + 1.5.3 + + + org.objectweb.asm + com.springsource.org.objectweb.asm.attrs + 1.5.3 + + + + + org.apache.ant + com.springsource.org.apache.tools.ant + 1.7.0 + + + + + org.apache.commons + com.springsource.org.apache.commons.net + 1.4.1 + + + org.apache.oro + com.springsource.org.apache.oro + 2.0.8 + + + org.apache.bsf + com.springsource.org.apache.bsf + 2.4.0 + + + org.beanshell + com.springsource.bsh + 2.0.0.b4 + + + + + org.apache.commons + + com.springsource.org.apache.commons.io + + 1.4.0 + + + org.apache.commons + com.springsource.org.apache.commons.collections + 3.2.0 + + + org.argeo.dep.osgi + org.argeo.dep.osgi.commons.cli + 1.1 + + + org.apache.commons + com.springsource.org.apache.commons.pool + 1.4.0 + + + org.apache.commons + com.springsource.org.apache.commons.dbcp + 1.2.2.osgi + + + + + org.hsqldb + com.springsource.org.hsqldb + 1.8.0.9 + + + net.sourceforge.jtds + com.springsource.net.sourceforge.jtds + 1.2.2 + + + com.mysql.jdbc + com.springsource.com.mysql.jdbc + 5.1.6 + + + + + org.codehaus.castor + com.springsource.org.castor + 1.2.0 + + + org.apache.xerces + + com.springsource.org.apache.xerces + + 2.8.1 + + + org.apache.xalan + + com.springsource.org.apache.xalan + + 2.7.0 + + + org.apache.xmlcommons + com.springsource.org.apache.xmlcommons + 1.3.3 + + + + + javax.servlet + com.springsource.javax.servlet + 2.5.0 + + + javax.servlet + com.springsource.javax.servlet.jsp + 2.1.0 + + + javax.el + com.springsource.javax.el + 1.0.0 + + + javax.servlet + + com.springsource.javax.servlet.jsp.jstl + + 1.1.2 + + + org.apache.taglibs + + com.springsource.org.apache.taglibs.standard + + 1.1.2 + + + javax.activation + com.springsource.javax.activation + 1.1.1 + + + com.lowagie.text + + com.springsource.com.lowagie.text + + 2.0.8 + + + + + org.apache.catalina + com.springsource.org.apache.catalina + ${version.tomcat} + + + org.apache.jasper + com.springsource.org.apache.jasper + ${version.tomcat} + + + org.apache.el + com.springsource.org.apache.el + ${version.tomcat} + + + + + org.apache.maven + maven-core + ${version.maven} + + + org.apache.maven + maven-embedder + + 2.0.4 + + + org.apache.maven + maven-settings + ${version.maven} + + + + org.apache.archiva + archiva-webapp + 1.1.3 + war + + + + + org.eclipse.osgi + org.eclipse.osgi + ${version.equinox} + + + + + org.argeo.dep.jemmy + org.argeo.dep.jemmy.nb61 + 0.2.2 + + + + + javax.transaction + + com.springsource.javax.transaction + + 1.1.0 + + + org.hibernate + com.springsource.org.hibernate + 3.2.6.ga + + + + net.sourceforge.jexcelapi + com.springsource.jxl + 2.6.6 + + + net.sourceforge.ehcache + com.springsource.net.sf.ehcache + 1.4.1 + + + edu.emory.mathcs.backport + + com.springsource.edu.emory.mathcs.backport + + 3.1.0 + + + javax.wsdl + com.springsource.javax.wsdl + 1.6.1 + + + + + javax.jms + com.springsource.javax.jms + 1.1.0 + + + org.apache.geronimo.specs + com.springsource.javax.management.j2ee + 1.0.1 + + + + + org.argeo.dep.osgi + org.argeo.dep.osgi.activemq + ${version.activemq} + + + org.apache.activemq + com.springsource.org.apache.activemq.pool + 5.2.0 + + + org.apache.activemq + com.springsource.org.apache.activemq + + + + + + javax.xml.soap + com.springsource.javax.xml.soap + 1.3.0 + + + javax.xml.rpc + com.springsource.javax.xml.rpc + 1.1.0 + + + javax.ejb + com.springsource.javax.ejb + 3.0.0 + + + + org.apache.camel + com.springsource.org.apache.camel + 1.3.0 + + + + + + + central + http://repo1.maven.org/maven2 + + true + daily + warn + + + false + never + fail + + + + com.springsource.repository.bundles.release + + SpringSource Enterprise Bundle Repository - SpringSource + Bundle + Releases + + + http://repository.springsource.com/maven/bundles/release + + + true + daily + fail + + + false + never + fail + + + + com.springsource.repository.bundles.external + + SpringSource Enterprise Bundle Repository - External + Bundle + Releases + + + http://repository.springsource.com/maven/bundles/external + + + true + daily + fail + + + false + never + fail + + + + argeo + http://www.argeo.org/maven/argeo + + true + daily + fail + + + false + never + fail + + + + argeo-snapshots + http://www.argeo.org/maven/argeo-snapshots + + false + never + fail + + + true + always + fail + + + + + + argeo + http://www.argeo.org/maven/argeo + + true + daily + fail + + + false + never + fail + + + + argeo-snapshots + http://www.argeo.org/maven/argeo-snapshots + + false + never + fail + + + true + always + fail + + + + + + false + argeo-restricted + Argeo FOSS Repository + file:///var/argeo/maven2/argeo + + + true + argeo-snapshots-restricted + Argeo FOSS Snapshots Repository + file:///var/argeo/maven2/argeo-snapshots + + + argeo-slc-site + SLC Site + file://${site.repoBase}/${developmentCycle}/ + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + index + summary + license + scm + issue-tracking + + + + false + + project-team + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + false + + true + + + + org.apache.maven.plugins + maven-jxr-plugin + + true + + + + org.apache.maven.plugins + maven-surefire-report-plugin + false + + true + + + + + org.codehaus.mojo + taglist-maven-plugin + + true + + TODO + FIXME + @deprecated + + + + + + org.apache.maven.plugins + maven-changelog-plugin + false + + + - withIT - - true - - - integration-tests - + developer + + file://${user.home}/dev/work/slcSite + ${site.repoBase} + + + + true + argeo-snapshots-restricted + Argeo FOSS Snapshots Repository + scpexe://argeo.org/var/argeo/maven2/argeo-snapshots + + - withoutIT + release + + + argeo-slc-site + SLC Site + file://${site.repoBase}/${project.version} + + + diff --git a/runtime/pom.xml b/runtime/pom.xml index 5bd724441..cfe68ab31 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -63,59 +63,14 @@ + diff --git a/runtime/src/site.xml b/runtime/src/site.xml deleted file mode 100644 index 1d850b0f9..000000000 --- a/runtime/src/site.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Argeo SLC - - - ${reports} - - ${modules} - - - diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml index b4ee31ebc..d118d9dbc 100644 --- a/server/org.argeo.slc.ria/pom.xml +++ b/server/org.argeo.slc.ria/pom.xml @@ -1,35 +1,22 @@ - + 4.0.0 - org.argeo.slc.server - argeo-slc-server + org.argeo.slc + server 0.11.4-SNAPSHOT .. + org.argeo.slc.server org.argeo.slc.ria jar - Argeo SLC Web UI + Argeo SLC RIA org.apache.maven.plugins maven-compiler-plugin - - maven-jar-plugin - - - false - src/META-INF/MANIFEST.MF - - src/ - - index.jsp - argeo-ria/** - WEB-INF/* - - - org.argeo.slc.maven maven-argeo-qooxdoo-plugin @@ -44,7 +31,7 @@ slc-source - process-sources + test generate @@ -54,7 +41,7 @@ slc-build - compile + test generate @@ -62,11 +49,16 @@ slc-build - + + slc-test + site + + generate + + + slc-test + + slc-api site @@ -79,6 +71,21 @@ + + maven-jar-plugin + + + false + src/META-INF/MANIFEST.MF + + src/ + + index.jsp + argeo-ria/** + WEB-INF/* + + + org.apache.maven.plugins maven-assembly-plugin diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml index 37d37e835..3bc3388b1 100644 --- a/server/org.argeo.slc.siteserver/pom.xml +++ b/server/org.argeo.slc.siteserver/pom.xml @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.argeo.slc.server - argeo-slc-server + org.argeo.slc + server 0.11.4-SNAPSHOT .. diff --git a/server/pom.xml b/server/pom.xml index d3eda1f7d..16b288390 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,8 +6,8 @@ 0.11.4-SNAPSHOT .. - org.argeo.slc.server - argeo-slc-server + org.argeo.slc + server pom Argeo SLC Server diff --git a/src/site/apt/gettingStarted.apt b/src/site/apt/gettingStarted.apt new file mode 100644 index 000000000..87d5a5c09 --- /dev/null +++ b/src/site/apt/gettingStarted.apt @@ -0,0 +1,3 @@ +Development Environment + + First, you need to create a development environment. \ No newline at end of file diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt new file mode 100644 index 000000000..04944c56c --- /dev/null +++ b/src/site/apt/index.apt @@ -0,0 +1,7 @@ +Software Life Cycle (SLC) + + SLC provides QA tools. + +Links + + Argeo RIA API: {{server/org.argeo.slc.ria/argeo-ria-api/index.html}} \ No newline at end of file diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml new file mode 100644 index 000000000..2cdb53753 --- /dev/null +++ b/src/site/fml/faq.fml @@ -0,0 +1,40 @@ + + + General + + + What does SLC mean? + +

+ Any valid XHTML can be placed in the + answer + element +

+ + + + + + Technical + + How do I start the demo? + +

+ From the demo directory ( + cd demo + ) of the source distribution (or workingcopy) run: +
+ mvn argeo:osgi:equinox -Pserver +
+ then, in another console, also in the demo directory: +
+ mvn argeo:osgi:equinox -Pagent +
+ Then open + http://localhost:7070/org.argeo.slc.ria + +

+ + + + \ No newline at end of file diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 000000000..685bf7a23 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.2