Menu
▾
▴
[Smartfrog-checkins] core/components/deployapi project-template.pom,NONE,1.1 .cvsignore,1.4,1.5 build.xml,1.29,1.30
|
From: Steve L. <st...@us...> - 2006-04-28 17:44:52
|
Update of /cvsroot/smartfrog/core/components/deployapi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23902/components/deployapi Modified Files: .cvsignore build.xml Added Files: project-template.pom Log Message: this is the codebase used for the first public deploy api endpoint --- NEW FILE: project-template.pom --- <project> <modelVersion>4.0.0</modelVersion> <groupId>org.smartfrog</groupId> <artifactId>sf-deployapi</artifactId> <packaging>jar</packaging> <version>${artifact.version}</version> <dependencies> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> <version>${commons-logging.version}</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>${commons-lang.version}</version> <exclusions> <exclusion> <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.smartfrog</groupId> <artifactId>sf-cdl</artifactId> <version>${artifact.version}</version> </dependency> <dependency> <groupId>org.smartfrog</groupId> <artifactId>sf-m32</artifactId> <version>${artifact.version}</version> </dependency> </dependencies> </project> Index: .cvsignore =================================================================== RCS file: /cvsroot/smartfrog/core/components/deployapi/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .cvsignore 21 Sep 2005 14:59:05 -0000 1.4 --- .cvsignore 28 Apr 2006 17:44:41 -0000 1.5 *************** *** 1,4 **** - deployapi.iml build dist build.properties --- 1,13 ---- build dist build.properties + runtime.properties + common.properties + *.jpx + *.ipr + *.iml + *.iws + .classpath + .project + lib + Index: build.xml =================================================================== RCS file: /cvsroot/smartfrog/core/components/deployapi/build.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** build.xml 24 Apr 2006 14:53:12 -0000 1.29 --- build.xml 28 Apr 2006 17:44:41 -0000 1.30 *************** *** 105,116 **** <target name="core-libraries" depends="ready-to-declare-classpaths"> ! <m2:libraries pathID="core.classpath"> ! ! <dependency groupID="org.ggf" ! artifactID="cddlm" ! version="${cddlm.version}"/> <dependency groupID="commons-lang" artifactID="commons-lang" ! version="${commons-lang.version}"/> <dependency groupID="commons-logging" artifactID="commons-logging-api" --- 105,116 ---- <target name="core-libraries" depends="ready-to-declare-classpaths"> ! <m2:libraries pathID="core.classpath" > <dependency groupID="commons-lang" artifactID="commons-lang" ! version="${commons-lang.version}"> ! <exclusion ! groupId="junit" ! artifactId="junit"/> ! </dependency> <dependency groupID="commons-logging" artifactID="commons-logging-api" *************** *** 119,136 **** artifactID="log4j" version="${log4j.version}"/> - <!-- - <dependency groupID="junit" - artifactID="junit" - version="${junit.version}"/> - --> - <dependency groupID="jaxen" - artifactID="jaxen" - version="${jaxen.version}"/> - <dependency groupID="xom" - artifactID="xom" - version="${xom.version}"/> - <dependency groupID="xalan" - artifactID="xalan" - version="${xalan.version}"/> </m2:libraries> </target> --- 119,122 ---- *************** *** 154,158 **** <target name="smartfrog-modules-classpath" depends="ready-to-declare-classpaths"> ! <m2:libraries pathID="smartfrog.modules.classpath"> <dependency groupID="org.smartfrog" artifactID="sf-xml" --- 140,144 ---- <target name="smartfrog-modules-classpath" depends="ready-to-declare-classpaths"> ! <m2:libraries pathID="smartfrog.modules.classpath" verbose="true"> <dependency groupID="org.smartfrog" artifactID="sf-xml" *************** *** 197,210 **** </target> - <target name="stax-libraries" depends="ready-to-declare-classpaths"> - <m2:libraries pathID="stax.classpath"> - <dependency groupID="stax" - artifactID="stax" - version="${stax.version}"/> - <dependency groupID="stax" - artifactID="stax-api" - version="${stax-api.version}"/> - </m2:libraries> - </target> <target name="declare-exec.classpath" depends="declare-compile.classpath" > --- 183,186 ---- *************** *** 269,297 **** </target> - <target name="archives" depends="init" - description="create the .aar files"> - - <property name="build.archives.dir" location="${build.dir}/archives" /> - <mkdir dir="${build.archives.dir}" /> - <property name="system.aar" location="${build.archives.dir}/system.aar" /> - <property name="archives.dir" location="archives" /> - <jar destFile="${system.aar}"> - <fileset dir="${archives.dir}/system" includes="**/*" /> - </jar> - <!-- - <property name="portal.aar" location="${build.archives.dir}/portal.aar"/> - <jar destFile="${portal.aar}"> - <fileset dir="${archives.dir}/portal" includes="**/*"/> - </jar> - --> - </target> - - <target name="copy-archives" depends="archives" - description="copy the archives to where they can be checked in to SCM"> - <copy todir="${services.dir}"> - <fileset dir="${build.archives.dir}" includes="*.aar" /> - </copy> - </target> - <target name="default" depends="war" /> --- 245,248 ---- *************** *** 428,432 **** <!-- make the WAR file --> ! <target name="war" depends="post-compile,copy-archives" description="Create the WAR file"> <property name="target.war.name" --- 379,383 ---- <!-- make the WAR file --> ! <target name="war" depends="post-compile" description="Create the WAR file"> <property name="target.war.name" *************** *** 483,488 **** <flattenmapper/> </copypath> </target> - <!-- ========================================================== --> <!-- set--> --- 434,439 ---- <flattenmapper/> </copypath> + <!--now purge some junk that is creeping in that we do *not* want.--> </target> <!-- ========================================================== --> <!-- set--> *************** *** 532,537 **** </ac:if> </target> ! ! <!-- ========================================================== --> --- 483,516 ---- </ac:if> </target> ! ! <target name="parse-server" depends="package-tests,init-codebase" ! description="parse the deployment descriptor for a server"> ! <fail unless="server">Set the "server" property!</fail> ! <property name="server.dir" location="hosts/${server}" /> ! <property name="parse.timestamp" ! location="${build.dir}/parse-${server}.timestamp"/> ! <property name="default.sf" ! location="${server.dir}/default.sf"/> ! <ac:if> ! <not> ! <uptodate ! srcfile="${default.sf}" ! targetfile="${parse.timestamp}"/> ! </not> ! <ac:then> ! <sf:parse quiet="${parse.quiet}"> ! <classpath path="${target.jar}:${test.jar}"/> ! <sysproperty key="deployapi.war.dir" ! value="${deployapi.war.dir}"/> ! <sysproperty key="org.smartfrog.codebase" ! value="${codebase}"/> ! <!-- source files --> ! <source file="${default.sf}"/> ! </sf:parse> ! <!-- on success, we touch a property file to note we got it out --> ! <touch file="${parse.timestamp}"/> ! </ac:then> ! </ac:if> ! </target> <!-- ========================================================== --> *************** *** 568,574 **** application="${application.name}"/> </target> ! ! ! ! </project> \ No newline at end of file --- 547,635 ---- application="${application.name}"/> </target> ! ! ! <!-- ========================================================== --> ! <!-- installation includes the test jars as well as all the dependencies--> ! <!-- ========================================================== --> ! <target name="install" depends="init-codebase,dist,package-tests,m2-install"> ! <property name="install.dir" location="${smartfrog.dist.lib.dir}"/> ! <mkdir dir="${install.dir}"/> ! <copy todir="${install.dir}"> ! <fileset file="${target.jar}"/> ! <fileset file="${test.jar}"/> ! <fileset dir="${build.codebase.dir}" includes="*.jar"/> ! </copy> ! </target> ! ! <!-- SCP logic from JDwA, core-chapter-08.xml --> ! ! ! <!-- ! init file should look like ! ssh.server=192.168.2.84 ! ssh.user=${user.name} ! ssh.dir=SmartFrog/dist/ ! ssh.keyfile=${user.home}/.ssh/id_rsa ! ssh.passphrase=secret ! ssh.port=22 ! ssh.verbose=true ! ! the secure/ dir should not be readable by group; in windows lock it down ! --> ! <target name="ssh-init" depends="init"> ! <fail unless="server">Set the "server" property!</fail> ! <property name="ssh.propfile" ! location="hosts/secure/${server}.ssh.properties"/> ! <loadproperties srcFile="${ssh.propfile}"/> ! <property name="tmp.dir" location="${build.dir}/tmp"/> ! <mkdir dir="${tmp.dir}"/> ! <presetdef name="ssh-cmd"> ! <sshexec host="${ssh.server}" ! username="${ssh.user}" ! passphrase="${ssh.passphrase}" ! keyfile="${ssh.keyfile}"/> ! </presetdef> ! <presetdef name="ssh-cp"> ! <scp ! passphrase="${ssh.passphrase}" ! keyfile="${ssh.keyfile}" ! port="${ssh.port}" ! verbose="${ssh.verbose}"> ! </scp> ! </presetdef> ! </target> ! ! ! <target name="ssh-mkdirs" depends="ssh-init"> ! <ssh-cmd command="mkdir -p ${ssh.dir}/bin"/> ! <ssh-cmd command="mkdir -p ${ssh.dir}/lib"/> ! <ssh-cmd failonerror="false" command="cd ${ssh.dir}/bin; ./sfStopDaemon localhost" /> ! </target> ! ! <target name="ssh-prepare-files" depends="install"> ! <fileset id="ssh.fileset" dir="${install.dir}" includes="*.jar" /> ! </target> ! ! <!-- insert trust="true" to turn on trust --> ! <target name="scp-upload" depends="ssh-init,ssh-mkdirs,ssh-prepare-files"> ! <echo>SCP target is ${ssh.server}</echo> ! <property name="ssh.path" ! value="${ssh.user}@${ssh.server}:${ssh.dir}"/> ! <!--copy the binaries--> ! <ssh-cp remoteToDir="${ssh.path}/lib"> ! <fileset refid="ssh.fileset"/> ! </ssh-cp> ! <ssh-cp remoteToDir="${ssh.path}/bin"> ! <fileset dir="hosts/${server}" includes="default.*"/> ! </ssh-cp> ! ! </target> ! ! <target name="ssh-run" depends="ssh-init"> ! <ssh-cmd command="cd ${ssh.dir}; nohup ./sfStopDaemon > log.txt &"/> ! </target> ! ! <target name="scp" depends="scp-upload" ! description="upload the files"/> ! </project> \ No newline at end of file |