From tuscany-commitsabennett@example.com Sat Dec 01 00:09:08 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 15951 invoked from network); 1 Dec 2007 00:09:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 00:09:08 -0000 Received: (qmail 1967 invoked by uid 500); 1 Dec 2007 00:08:56 -0000 Delivered-To: abennett@example.com Received: (qmail 1944 invoked by uid 500); 1 Dec 2007 00:08:56 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 1935 invoked by uid 99); 1 Dec 2007 00:08:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2007 16:08:55 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 00:08:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2B26B1A9832; Fri, 30 Nov 2007 16:08:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600022 - /incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java Date: Sat, 01 Dec 2007 00:08:46 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Fri Nov 30 16:08:40 2007 New Revision: 600022 URL: http://svn.apache.org/viewvc?rev=600022&view=rev Log: Minor cleanup, use Maven log mechanism. Modified: incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java Modified: incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java?rev=600022&r1=600021&r2=600022&view=diff ============================================================================== --- incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java (original) +++ incubator/tuscany/java/sca/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java Fri Nov 30 16:08:40 2007 @@ -30,7 +30,6 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.FileSet; -import org.apache.maven.model.Resource; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; @@ -104,7 +103,7 @@ public void execute() throws MojoExecutionException { - System.out.println("Generating " + buildFile); + getLog().info("Generating " + buildFile); // Open the target build.xml file File targetFile = new File(buildFile); @@ -118,10 +117,6 @@ // Determine the project packaging String packaging = project.getPackaging().toLowerCase(); - for (Object resource: project.getResources()) { - System.out.println("Resource: " + resource); - } - // Determine the module dependencies List<Artifact> tuscanyModules = new ArrayList<Artifact>(); List<Artifact> otherModules = new ArrayList<Artifact>(); --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 06:32:32 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 51513 invoked from network); 1 Dec 2007 06:32:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 06:32:32 -0000 Received: (qmail 95281 invoked by uid 500); 1 Dec 2007 06:32:19 -0000 Delivered-To: abennett@example.com Received: (qmail 95261 invoked by uid 500); 1 Dec 2007 06:32:19 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 95252 invoked by uid 99); 1 Dec 2007 06:32:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2007 22:32:19 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 06:31:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 94DB31A9832; Fri, 30 Nov 2007 22:31:59 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600052 - in /incubator/tuscany/cpp: das/ das/antscripts/ sdo/ sdo/antscripts/ sdo/samples/ sdo/samples/misc/ Date: Sat, 01 Dec 2007 06:31:58 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: adrianocrestani Date: Fri Nov 30 22:31:57 2007 New Revision: 600052 URL: http://svn.apache.org/viewvc?rev=600052&view=rev Log: -adding distribution ant task to sdo -adding sample ant task to sdo Added: incubator/tuscany/cpp/sdo/antscripts/OpenPGP.jar (with props) incubator/tuscany/cpp/sdo/samples/build.xml incubator/tuscany/cpp/sdo/samples/misc/build.xml Modified: incubator/tuscany/cpp/das/antscripts/TuscanyMSVC8DevStudioCCompiler.jar incubator/tuscany/cpp/das/build.xml incubator/tuscany/cpp/sdo/antscripts/platform.properties incubator/tuscany/cpp/sdo/antscripts/system.xml incubator/tuscany/cpp/sdo/build.xml Modified: incubator/tuscany/cpp/das/antscripts/TuscanyMSVC8DevStudioCCompiler.jar URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/antscripts/TuscanyMSVC8DevStudioCCompiler.jar?rev=600052&r1=600051&r2=600052&view=diff ============================================================================== Binary files - no diff available. Modified: incubator/tuscany/cpp/das/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/build.xml?rev=600052&r1=600051&r2=600052&view=diff ============================================================================== --- incubator/tuscany/cpp/das/build.xml (original) +++ incubator/tuscany/cpp/das/build.xml Fri Nov 30 22:31:57 2007 @@ -175,7 +175,7 @@ <copy overwrite="true" todir="${distribution.src.dir}"> - <fileset dir="." excludes="deploy/ distribution/ **/VSExpress/"/> + <fileset dir="." excludes="deploy/ distribution/ **/VSExpress/ antscripts/OpenPGP.jar"/> </copy> <antcall target="tools"/> @@ -191,7 +191,7 @@ <copy overwrite="true" todir="${distribution.dir}/bin/antscripts"> - <fileset dir="antscripts"/> + <fileset dir="antscripts" excludes="OpenPGP.jar"/> </copy> <ant target="distribution" antfile="${samples.dir}/build.xml"/> Added: incubator/tuscany/cpp/sdo/antscripts/OpenPGP.jar URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/antscripts/OpenPGP.jar?rev=600052&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/tuscany/cpp/sdo/antscripts/OpenPGP.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: incubator/tuscany/cpp/sdo/antscripts/platform.properties URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/antscripts/platform.properties?rev=600052&r1=600051&r2=600052&view=diff ============================================================================== --- incubator/tuscany/cpp/sdo/antscripts/platform.properties (original) +++ incubator/tuscany/cpp/sdo/antscripts/platform.properties Fri Nov 30 22:31:57 2007 @@ -26,6 +26,12 @@ platform.tuscanySDO.root.dir= platform.tuscanySDO.install.dir= +platform.tuscanySDO.release.file.name= +platform.tuscanySDO.distribution.dir= + +platform.public.key.path= +platform.secret.key.path= +platform.key.id= platform.sdo.impl.library.name= platform.sdo.impl.library.path= Modified: incubator/tuscany/cpp/sdo/antscripts/system.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/antscripts/system.xml?rev=600052&r1=600051&r2=600052&view=diff ============================================================================== --- incubator/tuscany/cpp/sdo/antscripts/system.xml (original) +++ incubator/tuscany/cpp/sdo/antscripts/system.xml Fri Nov 30 22:31:57 2007 @@ -26,6 +26,7 @@ <taskdef resource="net/sf/antcontrib/antlib.xml"/> <taskdef resource="cpptasks.tasks"/> <typedef resource="cpptasks.types"/> + <typedef name="signer" classname="org.apache.commons.openpgp.ant.OpenPgpSignerTask" classpath="${basedir}/antscripts/OpenPGP.jar"/> <!-- Configure the tuscanySDO.root.dir @@ -95,6 +96,88 @@ <property name="tuscanySDO.library.version" value=".0.0.0"/> </else> </if> + +<!-- + Configure tuscanySDO.release.file.name that defines the generated packed file used on releases + Take the override value from platform.properties if set + Else take it from env var TUSCANY_SDOCPP_RELEASE_NAME + If both are not defined, use as default "tuscany_sdo_cpp" name + --> + <if> + <and> + <isset property="platform.tuscanySDO.release.file.name"/> + <length string="${platform.tuscanySDO.release.file.name}" when="greater" length="0" trim="true"/> + </and> + <then> + <property name="tuscanySDO.release.file.name" value="${platform.tuscanySDO.release.file.name}"/> + </then> + <elseif> + <and> + <isset property="env.TUSCANY_SDOCPP_RELEASE_NAME"/> + <length string="${env.TUSCANY_SDOCPP_RELEASE_NAME}" when="greater" length="0" trim="true"/> + </and> + <then> + <property name="tuscanySDO.release.file.name" value="${env.TUSCANY_SDOCPP_RELEASE_NAME}"/> + </then> + </elseif> + <else> + <property name="tuscanySDO.release.file.name" value="tuscany_sdo_cpp"/> + </else> + </if> + +<!-- + Configure distribution.dir that defines where the distribution files will be placed + Take the override value from platform.properties if set + Else assumes ${basedir}/distribution as the distribution folder + --> + <if> + <and> + <isset property="platform.tuscanySDO.distribution.dir"/> + <length string="${platform.tuscanySDO.distribution.dir}" when="greater" length="0" trim="true"/> + </and> + <then> + <property name="distribution.dir" location="${platform.tuscanySDO.distribution.dir}"/> + </then> + <else> + <property name="distribution.dir" value="${basedir}/distribution"/> + </else> + </if> + +<!-- + Load key id, public and secret key path from platform.properties files into key.id, public.key.path and secret.key.path variables respectively + Also checks if the user defined the password on the command line + --> + <target name="check.keys"> + <if> + <and> + <isset property="platform.public.key.path"/> + <isset property="platform.key.id"/> + <isset property="platform.secret.key.path"/> + <length string="${platform.public.key.path}" when="greater" length="0" trim="true"/> + <length string="${platform.key.id}" when="greater" length="0" trim="true"/> + <length string="${platform.secret.key.path}" when="greater" length="0" trim="true"/> + </and> + <then> + <property name="public.key.path" location="${platform.public.key.path}"/> + <property name="secret.key.path" location="${platform.secret.key.path}"/> + <property name="key.id" value="${platform.key.id}"/> + </then> + <else> + <fail message="The public, secret and key id must be defined on platform.properties file"/> + </else> + </if> + <if> + <and> + <isset property="password"/> + <length string="${password}" when="greater" length="0" trim="true"/> </and> + <then> + <property name="secret.key.password" value="${password}"/> + </then> + <else> + <fail message='Secret key password was not properly set. Add on the ant command line, for example, -Dpassword="123"'/> + </else> + </if> + </target> <!-- Configure ${enable_ws} and ${axis2c.home.dir}, which is needed to compile the ws extension Modified: incubator/tuscany/cpp/sdo/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/build.xml?rev=600052&r1=600051&r2=600052&view=diff ============================================================================== --- incubator/tuscany/cpp/sdo/build.xml (original) +++ incubator/tuscany/cpp/sdo/build.xml Fri Nov 30 22:31:57 2007 @@ -1,93 +1,225 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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="TuscanySdoNative" default="all" basedir="."> - - <!-- - This is the root level ant build.xml file for TuscanySDO Native - Nothing is actually performed here, it just delegates to subdirectory - build.xml files. Common scripts used by all ant build files can be - found in the ant subdirectory. - --> - - <import file="antscripts/system.xml"/> - - <property name="runtime.sdo.dir" value="runtime/core"/> - - <!-- - Public targets - --> - - <target name="all" description="build and install all TuscanySdoNative source code and documentation"> - <antcall target="build"/> - <antcall target="install"/> - </target> - - <target name="build" description="Build all TuscanySdoNative source code and documentation"> - <antcall target="build.sdo"/> - <!--antcall target="generate.docs"/--> - </target> - - <target name="install" description="Install TuscanySdoNative libraries and headers"> - <antcall target="install.sdo"/> - <!--antcall target="install.docs"/--> - </target> - - <target name="clean" description="Clean all TuscanySdoNative compiled source code"> - <antcall target="clean.sdo"/> - <!--antcall target="clean.docs"/--> - </target> - - <target name="test" description="Run SDO tests"> - <ant target="test" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/> - </target> - - - <!-- - Internal targets - They can still be called, they're just not described, so wont show up in "ant -p" - Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings - --> - - <target name="build.sdo"> - <ant target="build" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/> - </target> - - <target name="generate.docs"> - <!--ant target="generate.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/--> - </target> - - <target name="install.sdo"> - <ant target="install" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/> - </target> - - <target name="install.docs"> - <!--ant target="install.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/--> - </target> - - <target name="clean.sdo"> - <ant target="clean" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/> - </target> - - <target name="clean.docs"> - <!--ant target="clean.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/--> - </target> - -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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="TuscanySdoNative" default="all" basedir="."> +<property name="test.dir" location="runtime/test"/> +<property name="samples.dir" location="samples"/> +<property name="tools.dir" location="tools"/> + + <!-- + This is the root level ant build.xml file for TuscanySDO Native + Nothing is actually performed here, it just delegates to subdirectory + build.xml files. Common scripts used by all ant build files can be + found in the ant subdirectory. + --> + + <import file="antscripts/system.xml"/> + + <property name="distribution.bin.dir" location="${distribution.dir}/bin"/> + <property name="distribution.src.dir" location="${distribution.dir}/src"/> + <property name="pack.dir" location="${distribution.dir}"/> + + <property name="runtime.sdo.dir" value="runtime/core"/> + + <!-- + Public targets + --> + + <target name="all" description="build and install all TuscanySdoNative source code and documentation"> + <antcall target="build"/> + <antcall target="install"/> + </target> + + <target name="build" description="Build all TuscanySdoNative source code and documentation"> + <antcall target="build.sdo"/> + <!--antcall target="generate.docs"/--> + </target> + + <target name="distribution" description="Generate all TuscanyDASNative distribution structure"> + <antcall target="distribution.sdo"/> + </target> + + <target name="install" description="Install TuscanySdoNative libraries and headers"> + <antcall target="install.sdo"/> + <!--antcall target="install.docs"/--> + </target> + + <target name="clean" description="Clean all TuscanySdoNative compiled source code"> + <antcall target="clean.sdo"/> + <!--antcall target="clean.docs"/--> + </target> + +<target name="samples" description="Build and Install all TuscanyDASNative samples"> + <antcall target="build.samples"/> +</target> + +<target name="pack.distribution" description="Build all TuscanySDONative source code and documentation" depends="check.keys"> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}bin.zip"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}src.zip"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}bin.tar.gz"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}src.tar.gz"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}bin.zip.md5"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}src.zip.md5"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}bin.tar.gz.md5"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}src.tar.gz.md5"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}bin.zip.asc"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}src.zip.asc"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}bin.tar.gz.asc"/> + <delete quiet="true" file="${pack.dir}/${tuscanySDO.release.file.name}src.tar.gz.asc"/> + <delete quiet="true" dir="${pack.dir}/${tuscanySDO.release.file.name}bin"/> + <delete quiet="true" dir="${pack.dir}/${tuscanySDO.release.file.name}src"/> + + <!--Packs the bin distribution--> + <mkdir dir="${pack.dir}/${tuscanySDO.release.file.name}bin"/> + <copy todir="${pack.dir}/${tuscanySDO.release.file.name}bin"> + <fileset dir="${distribution.bin.dir}" includes="**"/> + </copy> + + <zip destfile="${pack.dir}/${tuscanySDO.release.file.name}bin.zip" level="9"> + <fileset dir="${pack.dir}" includes="${tuscanySDO.release.file.name}bin/"/> + </zip> + + <tar destfile="${pack.dir}/${tuscanySDO.release.file.name}bin.tar.gz" compression="gzip" longfile="gnu"> + <fileset dir="${pack.dir}" includes="${tuscanySDO.release.file.name}bin/"/> + </tar> + + <delete quiet="true" dir="${pack.dir}/${tuscanySDO.release.file.name}bin"/> + + <!--Packs the src distribution--> + <mkdir dir="${pack.dir}/${tuscanySDO.release.file.name}src"/> + <copy todir="${pack.dir}/${tuscanySDO.release.file.name}src"> + <fileset dir="${distribution.src.dir}" includes="**"/> + </copy> + + <zip destfile="${pack.dir}/${tuscanySDO.release.file.name}src.zip" level="9"> + <fileset dir="${pack.dir}" includes="${tuscanySDO.release.file.name}src/"/> + </zip> + + <tar destfile="${pack.dir}/${tuscanySDO.release.file.name}src.tar.gz" compression="gzip" longfile="gnu"> + <fileset dir="${pack.dir}" includes="${tuscanySDO.release.file.name}src/"/> + </tar> + + <delete quiet="true" dir="${pack.dir}/${tuscanySDO.release.file.name}src"/> + + <!--Generate the checksum files--> + <checksum forceOverwrite="yes" file="${pack.dir}/${tuscanySDO.release.file.name}bin.zip" fileext=".md5"/> + <checksum forceOverwrite="yes" file="${pack.dir}/${tuscanySDO.release.file.name}src.zip" fileext=".md5"/> + <checksum forceOverwrite="yes" file="${pack.dir}/${tuscanySDO.release.file.name}bin.tar.gz" fileext=".md5"/> + <checksum forceOverwrite="yes" file="${pack.dir}/${tuscanySDO.release.file.name}src.tar.gz" fileext=".md5"/> + + <signer asciiarmor="true" artefact="${pack.dir}/${tuscanySDO.release.file.name}bin.zip" secring="${secret.key.path}" pubring="${public.key.path}" password="${secret.key.password}" keyid="${key.id}"/> + <signer asciiarmor="true" artefact="${pack.dir}/${tuscanySDO.release.file.name}src.zip" secring="${secret.key.path}" pubring="${public.key.path}" password="${secret.key.password}" keyid="${key.id}"/> + <signer asciiarmor="true" artefact="${pack.dir}/${tuscanySDO.release.file.name}bin.tar.gz" secring="${secret.key.path}" pubring="${public.key.path}" password="${secret.key.password}" keyid="${key.id}"/> + <signer asciiarmor="true" artefact="${pack.dir}/${tuscanySDO.release.file.name}src.tar.gz" secring="${secret.key.path}" pubring="${public.key.path}" password="${secret.key.password}" keyid="${key.id}"/> + + + </target> + + <target name="test" description="Run SDO tests"> + <ant target="test" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/> + </target> + + + <!-- + Internal targets + They can still be called, they're just not described, so wont show up in "ant -p" + Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings + --> + + <target name="build.sdo"> + <ant target="build" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/> + </target> + + <target name="generate.docs"> + <!--ant target="generate.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/--> + </target> + + <target name="install.sdo"> + <ant target="install" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/> + </target> + + <target name="install.docs"> + <!--ant target="install.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/--> + </target> + + <target name="clean.sdo"> + <ant target="clean" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/> + </target> + + <target name="clean.docs"> + <!--ant target="clean.docs" antfile="${runtime.sdo.dir}/build.xml" inheritAll="false"/--> + </target> + +<target name="distribution.sdo"> + <delete dir="${distribution.dir}" quiet="true"/> + <antcall target="clean"/> + + <!-- Create source distribution --> + <copy + overwrite="true" + todir="${distribution.src.dir}"> + <fileset dir="." excludes="samples/ deploy/ distribution/ **/VSExpress/ antscripts/OpenPGP.jar"/> + </copy> + + <!--<antcall target="tools"/>--> + <antcall target="all"/> + <antcall target="samples"/> + + + + <!-- Create bin distribution --> + <copy + overwrite="true" + todir="${distribution.bin.dir}"> + <fileset dir="${tuscanySDO.install.dir}"/> + </copy> + <copy + overwrite="true" + todir="${distribution.dir}/bin/antscripts"> + <fileset dir="antscripts" excludes="OpenPGP.jar"/> + </copy> + + <ant target="distribution" antfile="${samples.dir}/build.xml"/> + + <copy + overwrite="true" + todir="${distribution.src.dir}"> + <fileset dir="${distribution.bin.dir}/" includes="samples/" excludes="**/bin/"/> + </copy> + + <delete includeemptydirs="true"> + <fileset dir="${distribution.dir}" includes="**/VSExpress"/> + </delete> + + </target> + + <target name="build.samples"> + <ant target="all" antfile="${samples.dir}/build.xml" inheritAll="false"/> + </target> + + <target name="clean.samples"> + <ant target="clean" antfile="${samples.dir}/build.xml" inheritAll="false"/> + </target> + +<target name="clean.distribution"> + <delete dir="${distribution.dir}/" quiet="true"/> + </target> + +</project> Added: incubator/tuscany/cpp/sdo/samples/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/build.xml?rev=600052&view=auto ============================================================================== --- incubator/tuscany/cpp/sdo/samples/build.xml (added) +++ incubator/tuscany/cpp/sdo/samples/build.xml Fri Nov 30 22:31:57 2007 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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="TuscanySDONative_samples" default="all" basedir=".."> + + <!-- + This is the root level ant build.xml file for TuscanySDO Native samples + Nothing is actually performed here, it just delegates to subdirectory + build.xml files. + --> + + <import file="${basedir}/antscripts/system.xml"/> + <import file="${basedir}/antscripts/compile-targets.xml"/> + + + <!-- + Notice that the basedir for this project is set to the TuscanySDO root dir + This makes path setting in system.xml much simpler, but we'll just have to + set a property here to this directory. + --> + <property name="this.dir" location="${basedir}/samples"/> + + <property name="misc.dir" location="${this.dir}/misc"/> + + <!-- + Public targets + --> + + <target name="all" description="Build and install all TuscanySDONative samples"> + <antcall target="misc.sample"/> + </target> + + <!-- + Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings + --> + + <target name="misc.sample" description="Build and install the misc sample"> + <ant target="all" antfile="${misc.dir}/build.xml" inheritAll="false"/> + </target> + + <!-- clean --> + + <target name="clean" description="Clean all TuscanySDONative samples"> + <ant target="clean" antfile="${misc.dir}/build.xml" inheritAll="false"/> + </target> + + <target name="distribution" description="Generate the necessary distribution files of all samples and copy it to the distribution dir"> + <ant target="distribution" antfile="${misc.dir}/build.xml"/> + </target> + +</project> Added: incubator/tuscany/cpp/sdo/samples/misc/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/misc/build.xml?rev=600052&view=auto ============================================================================== --- incubator/tuscany/cpp/sdo/samples/misc/build.xml (added) +++ incubator/tuscany/cpp/sdo/samples/misc/build.xml Fri Nov 30 22:31:57 2007 @@ -0,0 +1,133 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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="TuscanySDONative_Sample_misc" default="all" basedir="../.."> + + <import file="${basedir}/antscripts/system.xml"/> + <import file="${basedir}/antscripts/compile-targets.xml"/> + + <!-- + Notice that the basedir for this project is set to the TuscanySDO root dir + This makes path setting in system.xml much simpler, but we'll just have to + set a property here to this directory. + --> + + <target name="init"> + <tstamp/> + <property name="this.dir" location="${basedir}/samples/misc"/> + <property name="sample.misc.dir" location="${this.dir}/build"/> + <property name="sample.misc.src.dir" location="${this.dir}"/> + <property name="sample.misc.build.dir" location="${sample.misc.dir}/build"/> + <property name="misc.install.dir" + location="${tuscanySDO.install.dir}/samples/misc/bin"/> + + + </target> + + <!-- + Public targets + --> + <target name="all" + description="build and install the TuscanySDONative misc sample"> + <antcall target="build"/> + <antcall target="install"/> + </target> + + <target name="build" + description="build the TuscanySDONative misc sample"> + <antcall target="build.sample.misc"/> + </target> + + <target name="install" + description="Install the TuscanySDONative misc sample"> + <antcall target="install.sample.misc"/> + </target> + + <target name="clean" + description="Clean the TuscanySDONative misc sample"> + <antcall target="clean.sample.misc"/> + + </target> + + <target name="distribution" description="Generate the necessary distribution files of misc sample and copy it to the distribution dir"> + <antcall target="sample.misc.distribution"/> + </target> + + <!-- + Internal targets + They can still be called, they're just not described, so wont show up in "ant -p" + --> + + <!-- build --> + + <target name="build.sample.misc" depends="init,check.ws"> + <mkdir dir="${sample.misc.build.dir}"/> + + <copy todir="${sample.misc.build.dir}"> + <fileset dir="${sample.misc.dir}" includes="*.h"/> + <fileset dir="${sample.misc.dir}" includes="*.cpp"/> + </copy> + <!-- build the library --> + <cpp-build + srcdir="${sample.misc.src.dir}" + infiles="*.cpp" + outdir="${sample.misc.build.dir}/.libs" + outtype="executable" + outfile="misc"> + <custom-build-elements> + <includepath path="${tuscanySDO.install.dir}/include"/> + <includepath path="${libxml2.include.dir}"/> + <includepath if="windows" path="${iconv.home.dir}/include"/> + <libset if="windows" dir="${libxml2.lib.dir}" libs="libxml2"/> + <libset unless="windows" dir="${libxml2.lib.dir}" libs="xml2"/> + +<libset dir="${tuscanySDO.install.dir}/lib" libs="tuscany_sdo"/> + </custom-build-elements> + </cpp-build> + </target> + + + <!-- install --> + + <target name="install.sample.misc" depends="init"> + <cpp-install-files + files="*.exe*" + srcdir="${sample.misc.dir}/build/.libs/" + destdir="${misc.install.dir}"/> + <copy todir="${misc.install.dir}" overwrite="true"> + <fileset dir="${this.dir}" includes="*.xsd, *.xml" excludes="build.xml"/> + </copy> + + </target> + + <!-- clean --> + + <target name="clean.sample.misc" depends="init"> + <delete dir="${sample.misc.dir}" quiet="true"/> + </target> + + <target name="sample.misc.distribution"> + <copy todir="${distribution.bin.dir}/samples/misc" overwrite="true"> + <fileset dir="${this.dir}/misc" excludes="build/ rsc/ VSExpress/"/> + </copy> + + + </target> + +</project> --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 06:52:06 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 58043 invoked from network); 1 Dec 2007 06:52:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 06:52:06 -0000 Received: (qmail 4499 invoked by uid 500); 1 Dec 2007 06:51:54 -0000 Delivered-To: abennett@example.com Received: (qmail 4468 invoked by uid 500); 1 Dec 2007 06:51:54 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 4459 invoked by uid 99); 1 Dec 2007 06:51:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2007 22:51:54 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 06:51:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CFAA71A9832; Fri, 30 Nov 2007 22:51:34 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600054 - /incubator/tuscany/cpp/sdo/README_ANT_INSTALL Date: Sat, 01 Dec 2007 06:51:34 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: adrianocrestani Date: Fri Nov 30 22:51:31 2007 New Revision: 600054 URL: http://svn.apache.org/viewvc?rev=600054&view=rev Log: -adding distribution task detains to README_ANT_INSTALL file Modified: incubator/tuscany/cpp/sdo/README_ANT_INSTALL Modified: incubator/tuscany/cpp/sdo/README_ANT_INSTALL URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/README_ANT_INSTALL?rev=600054&r1=600053&r2=600054&view=diff ============================================================================== --- incubator/tuscany/cpp/sdo/README_ANT_INSTALL (original) +++ incubator/tuscany/cpp/sdo/README_ANT_INSTALL Fri Nov 30 22:51:31 2007 @@ -161,17 +161,51 @@ Main targets: - all build and install all TuscanySdoNative source code and documentation - build Build all TuscanySdoNative source code and documentation - clean Clean all TuscanySdoNative compiled source code - install Install TuscanySdoNative libraries and headers - test Run SDO tests, not implemented yet + all build and install all TuscanySdoNative source code and documentation + build Build all TuscanySdoNative source code and documentation + clean Clean all TuscanySdoNative compiled source code + install Install TuscanySdoNative libraries and headers + test Run SDO tests, not implemented yet + distribution Create a source and bin distribution structure + pack.distribution Pack the bin and source distribution into .zip and .tar.gz files. Also generates the .asc and .md5 files Default target: all Public targets are those that have descriptions and are usually the only ones needed for compiling, installing and cleaning. For more avanced use, the private targets can be seen by looking at the actual build.xml file. + + +GENERATING A PROJECT DISTRIBUTION +================================= + +To create a src and bin distribution of Tuscany SDO subproject, there must be set some properties on platform.properties files: + +Property Required Example Description +-------- -------- ------- ----------- + +platform.public.key.path Yes "E:/gnupg/trustdb.gpg" The public key ring file path + +platform.secret.key.path Yes "E:/gnupg/secring.gpg" The secret key ring file path + +platform.key.id Yes "148CAFB2" The key id used to sign the distribution files + +platform.tuscanySDO.distribution.dir NO "C:\distribution\" The folder where the distribution files will be generated, default=tuscanySDO.root.dir/distribution + +platform.tuscanySDO.release.file.name NO "tuscany_das_native-1.0-incubator-M4-" The beginning of src and bin packed distribution file name, default="tuscany_cpp_das". + TUSCANY_DASCPP_RELEASE_NAME env var may be used as an alternative + +Also is required the bcpg-jdk<latest_version>-<latest_version>.jar and jce-jdk<latest_version>-<latest_version>.jar files defines on classpath. +Both can be found at http://www.bouncycastle.org/latest_releases.html + +Use the "distribution" target to generate the src and bin distribution file structure under platform.tuscanySDO.distribution.dir folder. +Then use the "pack.distribution" target to pack the bin and src distribution folders as .zip and .tar.gz and generate their .asc and .md5 files. +A password must be set on the command line when using pack.distribution target, this password is used to sign the packed distribution files with the secret key defined on platform.secret.key.path + +Usage: +ant distribution +// do whatever you want on the generated distribution files +ant pack.distribution -Dpassword="123456" CONFIGURATION --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 09:59:39 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 98146 invoked from network); 1 Dec 2007 09:59:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 09:59:39 -0000 Received: (qmail 80455 invoked by uid 500); 1 Dec 2007 09:59:27 -0000 Delivered-To: abennett@example.com Received: (qmail 80426 invoked by uid 500); 1 Dec 2007 09:59:27 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 80417 invoked by uid 99); 1 Dec 2007 09:59:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 01:59:27 -0800 X-ASF-Spam-Status: No, hits=-98.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 09:59:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B21691A9832; Sat, 1 Dec 2007 01:59:18 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600069 - in /incubator/tuscany/java/sca/distribution/tomcat: ./ src/ src/main/ src/main/assembly/ src/main/resources/ src/main/resources/sca-contributions/ src/test/ src/test/java/ Date: Sat, 01 Dec 2007 09:59:18 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sat Dec 1 01:59:16 2007 New Revision: 600069 URL: http://svn.apache.org/viewvc?rev=600069&view=rev Log: Add distribution for building tomcat deep integration zip Added: incubator/tuscany/java/sca/distribution/tomcat/ (with props) incubator/tuscany/java/sca/distribution/tomcat/pom.xml (with props) incubator/tuscany/java/sca/distribution/tomcat/src/ incubator/tuscany/java/sca/distribution/tomcat/src/main/ incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/ incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/bin.xml (with props) incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/ incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/ incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties (with props) incubator/tuscany/java/sca/distribution/tomcat/src/test/ incubator/tuscany/java/sca/distribution/tomcat/src/test/java/ Propchange: incubator/tuscany/java/sca/distribution/tomcat/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Dec 1 01:59:16 2007 @@ -0,0 +1,17 @@ +target +work +dojo +*.iws +*.ipr +*.iml +.project +.classpath +derby.log +maven.log +velocity.log* +junit*.properties +surefire*.properties +.settings +.deployables +.wtpmodules +.externalToolBuilders Added: incubator/tuscany/java/sca/distribution/tomcat/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/tomcat/pom.xml?rev=600069&view=auto ============================================================================== --- incubator/tuscany/java/sca/distribution/tomcat/pom.xml (added) +++ incubator/tuscany/java/sca/distribution/tomcat/pom.xml Sat Dec 1 01:59:16 2007 @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca</artifactId> + <version>1.1-incubating-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <name>Apache Tuscany SCA WebApp Runtime</name> + <artifactId>tuscany-tomcat-overlay</artifactId> + <packaging>pom</packaging> + + <dependencies> + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>tuscany-runtime-tomcat</artifactId> + <version>${pom.version}</version> + </dependency> + </dependencies> + + <build> + + <resources> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <tarLongFileMode>gnu</tarLongFileMode> + <finalName>apache-tuscany-tomcat-overlay-${pom.version}</finalName> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + +</project> Propchange: incubator/tuscany/java/sca/distribution/tomcat/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/distribution/tomcat/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sca/distribution/tomcat/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/bin.xml?rev=600069&view=auto ============================================================================== --- incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/bin.xml (added) +++ incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/bin.xml Sat Dec 1 01:59:16 2007 @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>bin</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + <format>tar.gz</format> + <format>zip</format> + </formats> + + <fileSets> + <!-- Add the text files to the top-level directroy --> + <!-- commented out till we distribute fileSet> + <directory>src/main/release</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>DISCLAIMER</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet --> + + <!-- Add the repository and properties file --> + <fileSet> + <directory>src/main/resources/sca-contributions</directory> + <outputDirectory>/sca-contributions</outputDirectory> + <includes> + <include>tuscany.properties</include> + </includes> + </fileSet> + </fileSets> + + <dependencySets> + <!-- Add all the dependent jars to the lib directory --> + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <unpack>false</unpack> + <scope>runtime</scope> + </dependencySet> + + </dependencySets> + +</assembly> Propchange: incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/bin.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/bin.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sca/distribution/tomcat/src/main/assembly/bin.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties?rev=600069&view=auto ============================================================================== --- incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties (added) +++ incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties Sat Dec 1 01:59:16 2007 @@ -0,0 +1,3 @@ +nodeName=http://localhost:8080/tuscany/ +domainName=http://localhost:8877 +hotDeployInterval=10000 Propchange: incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 10:00:26 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 98645 invoked from network); 1 Dec 2007 10:00:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 10:00:26 -0000 Received: (qmail 80680 invoked by uid 500); 1 Dec 2007 10:00:13 -0000 Delivered-To: abennett@example.com Received: (qmail 80652 invoked by uid 500); 1 Dec 2007 10:00:13 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 80643 invoked by uid 99); 1 Dec 2007 10:00:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 02:00:13 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 10:00:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2EBE01A9832; Sat, 1 Dec 2007 02:00:03 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600070 - /incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Date: Sat, 01 Dec 2007 10:00:02 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sat Dec 1 02:00:01 2007 New Revision: 600070 URL: http://svn.apache.org/viewvc?rev=600070&view=rev Log: Exclude all the Ant jars from the ws binding Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=600070&r1=600069&r2=600070&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original) +++ incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Sat Dec 1 02:00:01 2007 @@ -281,18 +281,48 @@ <groupId>org.apache.rampart</groupId> <artifactId>rampart-core</artifactId> <version>1.3</version> + <exclusions> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-xmlbeans</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-policy</artifactId> <version>1.3</version> + <exclusions> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-xmlbeans</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-trust</artifactId> <version>1.3</version> + <exclusions> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-xmlbeans</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 10:06:24 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 2140 invoked from network); 1 Dec 2007 10:06:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 10:06:24 -0000 Received: (qmail 83481 invoked by uid 500); 1 Dec 2007 10:06:12 -0000 Delivered-To: abennett@example.com Received: (qmail 83449 invoked by uid 500); 1 Dec 2007 10:06:12 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 83440 invoked by uid 99); 1 Dec 2007 10:06:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 02:06:12 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 10:06:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 04A4E1A9832; Sat, 1 Dec 2007 02:06:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600071 - in /incubator/tuscany/java/sca/samples/helloworld-ws-deep-webapp: ./ src/main/webapp/WEB-INF/web.xml Date: Sat, 01 Dec 2007 10:06:03 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sat Dec 1 02:06:02 2007 New Revision: 600071 URL: http://svn.apache.org/viewvc?rev=600071&view=rev Log: Add a webapp with sca but no tuscany stuff in web.xml to test deep integration Added: incubator/tuscany/java/sca/samples/helloworld-ws-deep-webapp/ - copied from r599368, incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/ Modified: incubator/tuscany/java/sca/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml Modified: incubator/tuscany/java/sca/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml?rev=600071&r1=599368&r2=600071&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml (original) +++ incubator/tuscany/java/sca/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml Sat Dec 1 02:06:02 2007 @@ -24,22 +24,4 @@ <display-name>Apache Tuscany HelloWorld Web Service Sample</display-name> - <listener> - <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class> - </listener> - - <servlet> - <servlet-name>TuscanyServlet</servlet-name> - <servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TuscanyServlet</servlet-name> - <url-pattern>/SCA/*</url-pattern> - </servlet-mapping> - - <welcome-file-list id="WelcomeFileList"> - <welcome-file>/SCA/HelloWorldComponent/HelloWorldService?wsdl</welcome-file> - </welcome-file-list> - </web-app> --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 10:25:04 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 4581 invoked from network); 1 Dec 2007 10:25:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 10:25:03 -0000 Received: (qmail 89854 invoked by uid 500); 1 Dec 2007 10:24:51 -0000 Delivered-To: abennett@example.com Received: (qmail 89829 invoked by uid 500); 1 Dec 2007 10:24:51 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 89820 invoked by uid 99); 1 Dec 2007 10:24:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 02:24:51 -0800 X-ASF-Spam-Status: No, hits=-98.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 10:24:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 365C91A9832; Sat, 1 Dec 2007 02:24:43 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600075 - /incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties Date: Sat, 01 Dec 2007 10:24:42 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sat Dec 1 02:24:42 2007 New Revision: 600075 URL: http://svn.apache.org/viewvc?rev=600075&view=rev Log: change to standalone node by default Modified: incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties Modified: incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties?rev=600075&r1=600074&r2=600075&view=diff ============================================================================== --- incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties (original) +++ incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties Sat Dec 1 02:24:42 2007 @@ -1,3 +1,3 @@ -nodeName=http://localhost:8080/tuscany/ -domainName=http://localhost:8877 +#nodeName=http://localhost:8080/tuscany/ +#domainName=http://localhost:8877 hotDeployInterval=10000 --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 10:28:05 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 5176 invoked from network); 1 Dec 2007 10:28:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 10:28:04 -0000 Received: (qmail 91174 invoked by uid 500); 1 Dec 2007 10:27:52 -0000 Delivered-To: abennett@example.com Received: (qmail 91153 invoked by uid 500); 1 Dec 2007 10:27:52 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 91144 invoked by uid 99); 1 Dec 2007 10:27:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 02:27:52 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 10:27:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5B6651A9832; Sat, 1 Dec 2007 02:27:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600076 - /incubator/tuscany/java/sca/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java Date: Sat, 01 Dec 2007 10:27:44 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sat Dec 1 02:27:43 2007 New Revision: 600076 URL: http://svn.apache.org/viewvc?rev=600076&view=rev Log: Add getter for node Modified: incubator/tuscany/java/sca/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java Modified: incubator/tuscany/java/sca/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java?rev=600076&r1=600075&r2=600076&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java (original) +++ incubator/tuscany/java/sca/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java Sat Dec 1 02:27:43 2007 @@ -332,4 +332,8 @@ } } } + + public SCANode getSCANode() { + return node; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 10:29:12 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 5342 invoked from network); 1 Dec 2007 10:29:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 10:29:12 -0000 Received: (qmail 92108 invoked by uid 500); 1 Dec 2007 10:28:59 -0000 Delivered-To: abennett@example.com Received: (qmail 92085 invoked by uid 500); 1 Dec 2007 10:28:59 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 92076 invoked by uid 99); 1 Dec 2007 10:28:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 02:28:59 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 10:28:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 724B51A9832; Sat, 1 Dec 2007 02:28:51 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600077 - /incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java Date: Sat, 01 Dec 2007 10:28:51 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sat Dec 1 02:28:50 2007 New Revision: 600077 URL: http://svn.apache.org/viewvc?rev=600077&view=rev Log: don't throw an exception just ignore Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=600077&r1=600076&r2=600077&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java (original) +++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java Sat Dec 1 02:28:50 2007 @@ -256,9 +256,9 @@ } public void setContextPath(String path) { - if (!contextPath.equals(path)) { - throw new IllegalArgumentException("invalid context path for webapp, existing context path: " + contextPath + " new contextPath: " + path); - } +// if (!contextPath.equals(path)) { +// throw new IllegalArgumentException("invalid context path for webapp, existing context path: " + contextPath + " new contextPath: " + path); +// } } } --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 10:30:39 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 5487 invoked from network); 1 Dec 2007 10:30:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 10:30:38 -0000 Received: (qmail 92824 invoked by uid 500); 1 Dec 2007 10:30:27 -0000 Delivered-To: abennett@example.com Received: (qmail 92745 invoked by uid 500); 1 Dec 2007 10:30:26 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 92736 invoked by uid 99); 1 Dec 2007 10:30:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 02:30:26 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 10:30:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 078F31A9832; Sat, 1 Dec 2007 02:30:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600078 - in /incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat: TuscanyContextListener.java TuscanyHost.java Date: Sat, 01 Dec 2007 10:30:14 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sat Dec 1 02:30:13 2007 New Revision: 600078 URL: http://svn.apache.org/viewvc?rev=600078&view=rev Log: Change to only start the node at the end of startup Modified: incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java Modified: incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java?rev=600078&r1=600077&r2=600078&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java (original) +++ incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java Sat Dec 1 02:30:13 2007 @@ -56,19 +56,18 @@ String path = sc.getServletContext().getRealPath("/"); System.out.println(path); try { - node.stop(); - node.addContribution(path, new File(path).toURL()); - node.addToDomainLevelComposite((QName)null); +// node.stop(); + node.addContribution(path, new File(path + "WEB-INF/classes").toURL()); } catch (MalformedURLException e) { e.printStackTrace(); } catch (NodeException e) { e.printStackTrace(); } - try { - node.start(); - } catch (NodeException e) { - e.printStackTrace(); - } +// try { +// node.start(); +// } catch (NodeException e) { +// e.printStackTrace(); +// } } protected void stopContext(Context context) { Modified: incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java?rev=600078&r1=600077&r2=600078&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java (original) +++ incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java Sat Dec 1 02:30:13 2007 @@ -27,12 +27,14 @@ import javax.servlet.ServletConfig; import javax.servlet.ServletContext; +import javax.xml.namespace.QName; import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; import org.apache.catalina.Wrapper; import org.apache.catalina.core.StandardContext; import org.apache.catalina.core.StandardHost; +import org.apache.tuscany.sca.node.NodeException; import org.apache.tuscany.sca.runtime.Launcher; /** @@ -58,7 +60,16 @@ public synchronized void start() throws LifecycleException { startRuntime(); - super.start(); + try { + + launcher.getSCANode().stop(); + super.start(); + launcher.getSCANode().addToDomainLevelComposite((QName)null); + launcher.getSCANode().start(); + + } catch (NodeException e) { + e.printStackTrace(); + } } public synchronized void stop() throws LifecycleException { --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 10:40:14 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 6945 invoked from network); 1 Dec 2007 10:40:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 10:40:14 -0000 Received: (qmail 96401 invoked by uid 500); 1 Dec 2007 10:40:02 -0000 Delivered-To: abennett@example.com Received: (qmail 96374 invoked by uid 500); 1 Dec 2007 10:40:01 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 96365 invoked by uid 99); 1 Dec 2007 10:40:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 02:40:01 -0800 X-ASF-Spam-Status: No, hits=-98.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 10:40:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9D3831A9832; Sat, 1 Dec 2007 02:39:40 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600080 - in /incubator/tuscany/java/sca/samples/helloworld-ws-service/src: main/java/helloworld/ main/resources/ main/resources/META-INF/ main/resources/META-INF/sca-deployables/ test/java/helloworld/ Date: Sat, 01 Dec 2007 10:39:40 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Sat Dec 1 02:39:38 2007 New Revision: 600080 URL: http://svn.apache.org/viewvc?rev=600080&view=rev Log: Change sample to have composite in deployables folder Added: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/ incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/ incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java - copied, changed from r599368, incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java Removed: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java Added: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite?rev=600080&view=auto ============================================================================== --- incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite (added) +++ incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite Sat Dec 1 02:39:38 2007 @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://helloworld" + xmlns:hw="http://helloworld" + name="helloworldws"> + + <component name="HelloWorldServiceComponent"> + <implementation.java class="helloworld.HelloWorldImpl" /> + <service name="HelloWorldService"> + <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> + <binding.ws uri="http://localhost:8085/HelloWorldService"/> + </service> + </component> + +</composite> Copied: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java (from r599368, incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java) URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java?p2=incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java&p1=incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java&r1=599368&r2=600080&rev=600080&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java (original) +++ incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java Sat Dec 1 02:39:38 2007 @@ -30,7 +30,7 @@ public static void main(String[] args) { - SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite"); + SCADomain scaDomain = SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite"); try { System.out.println("HelloWorld server started (press enter to shutdown)"); Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java?rev=600080&r1=600079&r2=600080&view=diff ============================================================================== --- incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java (original) +++ incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java Sat Dec 1 02:39:38 2007 @@ -38,7 +38,7 @@ @Before public void startServer() throws Exception { - scaDomain = SCADomain.newInstance("helloworldws.composite"); + scaDomain = SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite"); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: abennett@example.com For additional commands, e-mail: abennett@example.com From tuscany-commitsabennett@example.com Sat Dec 01 12:10:26 2007 Return-Path: <tuscany-commitsabennett@example.com> Delivered-To: abennett@example.com Received: (qmail 28294 invoked from network); 1 Dec 2007 12:10:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2007 12:10:26 -0000 Received: (qmail 40493 invoked by uid 500); 1 Dec 2007 12:10:14 -0000 Delivered-To: abennett@example.com Received: (qmail 40476 invoked by uid 500); 1 Dec 2007 12:10:14 -0000 Mailing-List: contact abennett@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:abennett@example.com> List-Unsubscribe: <mailto:abennett@example.com> List-Post: <mailto:abennett@example.com> List-Id: <tuscany-commits.ws.apache.org> Reply-To: abennett@example.com Delivered-To: mailing list abennett@example.com Received: (qmail 40467 invoked by uid 99); 1 Dec 2007 12:10:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 04:10:13 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2007 12:09:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1AADD1A9832; Sat, 1 Dec 2007 04:09:57 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600099 - in /incubator/tuscany/java/sca/tutorial/catalog-jse: ./ WEB-INF/ WEB-INF/web.xml calatolog-j2se.composite catalog.jsp pom.xml Date: Sat, 01 Dec 2007 12:09:56 -0000 To: abennett@example.com From: abennett@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <abennett@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: slaws Date: Sat Dec 1 04:09:55 2007 New Revision: 600099 URL: http://svn.apache.org/viewvc?rev=600099&view=rev Log: Start of a simple web app to run the fruits catalog as a counterpoint to the ejb wrapper round the ejb veg app Added: incubator/tuscany/java/sca/tutorial/catalog-jse/ (with props) incubator/tuscany/java/sca/tutorial/catalog-jse/WEB-INF/ incubator/tuscany/java/sca/tutorial/catalog-jse/WEB-INF/web.xml incubator/tuscany/java/sca/tutorial/catalog-jse/calatolog-j2se.composite incubator/tuscany/java/sca/tutorial/catalog-jse/catalog.jsp incubator/tuscany/java/sca/tutorial/catalog-jse/pom.xml Propchange: incubator/tuscany/java/sca/tutorial/catalog-jse/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Dec 1 04:09:55 2007 @@ -0,0 +1,3 @@ +.classpath +.project +.settings Added: incubator/tuscany/java/sca/tutorial/catalog-jse/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/catalog-jse/WEB-INF/web.xml?rev=600099&view=auto ============================================================================== --- incubator/tuscany/java/sca/tutorial/catalog-jse/WEB-INF/web.xml (added) +++ incubator/tuscany/java/sca/tutorial/catalog-jse/WEB-INF/web.xml Sat Dec 1 04:09:55 2007 @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + * 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. +--> + +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web +Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + + <display-name>Fruit Catalog</display-name> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>catalog.jsp</welcome-file> + </welcome-file-list> + +</web-app> Added: incubator/tuscany/java/sca/tutorial/catalog-jse/calatolog-j2se.composite URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/catalog-jse/calatolog-j2se.composite?rev=600099&view=auto ============================================================================== --- incubator/tuscany/java/sca/tutorial/catalog-jse/calatolog-j2se.composite (added) +++ incubator/tuscany/java/sca/tutorial/catalog-jse/calatolog-j2se.composite Sat Dec 1 04:09:55 2007 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample" + xmlns:sample="http://sample" + name="Calculator"> + + <component name="CalculatorServiceComponent"> + <implementation.java class="calculator.CalculatorServiceImpl"/> + <reference name="addService" target="AddServiceComponent"></reference> + <reference name="subtractService" target="SubtractServiceComponent"></reference> + <reference name="multiplyService" target="MultiplyServiceComponent"></reference> + <reference name="divideService" target="DivideServiceComponent"></reference> + </component> + + <component name="AddServiceComponent"> + <implementation.java class="calculator.AddServiceImpl"/> + </component> + + <component name="SubtractServiceComponent"> + <implementation.java class="calculator.SubtractServiceImpl"/> + </component> + + <component name="MultiplyServiceComponent"> + <implementation.java class="calculator.MultiplyServiceImpl"/> + </component> + + <component name="DivideServiceComponent"> + <implementation.java class="calculator.DivideServiceImpl"/> + </component> + +</composite> Added: incubator/tuscany/java/sca/tutorial/catalog-jse/catalog.jsp URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/catalog-jse/catalog.jsp?rev=600099&view=auto ============================================================================== --- incubator/tuscany/java/sca/tutorial/catalog-jse/catalog.jsp (added) +++ incubator/tuscany/java/sca/tutorial/catalog-jse/catalog.jsp Sat Dec 1 04:09:55 2007 @@ -0,0 +1,31 @@ +<%-- + * 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. +--%> + + +<html> +<head><title>Catalog</title></head> + +<body> +<table> + <tr> + <th>Item</th> + </tr> +</table> +</body> +</html> Added: incubator/tuscany/java/sca/tutorial/catalog-jse/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/catalog-jse/pom.xml?rev=600099&view=auto ============================================================================== --- incubator/tuscany/java/sca/tutorial/catalog-jse/pom.xml (added) +++ incubator/tuscany/java/sca/tutorial/catalog-jse/pom.xml Sat Dec 1 04:09:55 2007 @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-tutorial</artifactId> + <version>1.1-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>tutorial-catalog-jse</artifactId> + <name>Apache Tuscany SCA Tutorial Catalog WAR COntribution</name> + <packaging>war</packaging> + + <repositories> + <repository> + <id>apache.incubator</id> + <url>http://people.apache.org/repo/m2-incubating-repository</url> + </repository> + </repositories> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca-api</artifactId> + <version>1.1-incubating-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tutorial-assets</artifactId> + <version>1.1-incubating-SNAPSHOT</version> + </dependency> + + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.2</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <finalName>${artifactId}</finalName> + <sourceDirectory>${basedir}</sourceDirectory> + <resources> + <resource> + <directory>${basedir}</directory> + <excludes> + <exclude>**/*.java</exclude> + <exclude>**/.*/**</exclude> + <exclude>pom.xml</exclude> + <exclude>build.xml</exclude> + <exclude>target/**</exclude> + </excludes> + </resource> + </resources> + + <plugins> +
{'source': 'Apache Software Foundation Public Mail Archives'}