diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-04 07:25:10 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-04 07:25:10 +0000 |
| commit | 38895bd6eb783d085882325afee9655a03d117f0 (patch) | |
| tree | cef1b4cddf845212cce4aa9e8838a9c600182acf /branches/sca-java-2.0-M4 | |
| parent | 78afd2a15af4b48dcbb5dd35180d03357956d5a1 (diff) | |
Merge missing samples fix from trunk to M4
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@832673 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-2.0-M4')
| -rw-r--r-- | branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml | 3 | ||||
| -rw-r--r-- | branches/sca-java-2.0-M4/samples/pom.xml | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml b/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml index 740b7001ab..9c0d6fdca1 100644 --- a/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml +++ b/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml @@ -32,9 +32,12 @@ <include>calculator-osgi/**/*</include> <include>calculator-rmi-reference/**/*</include> <include>calculator-rmi-service/**/*</include> + <include>helloworld-bpel/**/*</include> <include>implementation-java-calculator/**/*</include> <include>dosgi-calculator/**/*</include> <include>dosgi-calculator-operations/**/*</include> + <include>dosgi-dynamic-calculator/**/*</include> + <include>dosgi-dynamic-calculator-operations/**/*</include> <include>webapps/helloworld/**/*</include> <include>webapps/helloworld-bpel/**/*</include> <include>webapps/helloworld-jms/**/*</include> diff --git a/branches/sca-java-2.0-M4/samples/pom.xml b/branches/sca-java-2.0-M4/samples/pom.xml index fc74a4228f..d7978a9fac 100644 --- a/branches/sca-java-2.0-M4/samples/pom.xml +++ b/branches/sca-java-2.0-M4/samples/pom.xml @@ -48,19 +48,20 @@ <module>calculator-osgi</module> <module>calculator-rmi-reference</module> <module>calculator-rmi-service</module> - <module>dosgi-calculator</module> <module>dosgi-calculator-operations</module> - <module>dosgi-dynamic-calculator</module> - <module>dosgi-dynamic-calculator-operations</module> +<!-- ********* + IF YOU ADD ANY SAMPLES THEN ALSO ADD THEM TO + distribution\all\src\main\components\bin-samples.xml + OR THEY WONT GET IN RELEASES + ********* --> + <module>dosgi-dynamic-calculator-operations</module> <module>helloworld-bpel</module> - <module>implementation-java-calculator</module> <module>binding-ws-calculator</module> - <module>webapps/helloworld</module> <module>webapps/helloworld-bpel</module> <module>webapps/helloworld-jms</module> @@ -68,10 +69,6 @@ <module>webapps/helloworld-jsp</module> <module>webapps/helloworld-stripes</module> <module>webapps/helloworld-servlet</module> -<!-- - <module>webapps/helloworld-rest</module> - <module>webapps/helloworld-wicket</module> ---> </modules> </profile> </profiles> |