Author: psharples
Date: Wed Aug 22 14:16:18 2012
New Revision: 1376065
URL: http://svn.apache.org/viewvc?rev=1376065&view=rev
Log:
Setup the digital signature client module so that it uses ivy for its
dependencies and also added new top level 'build-signer' task to generate a
self contained executable jar.
Added:
incubator/wookie/trunk/digsig-client/java/build.properties (with props)
incubator/wookie/trunk/digsig-client/java/build.xml (with props)
incubator/wookie/trunk/digsig-client/java/ivy.xml (with props)
Modified:
incubator/wookie/trunk/build.properties
incubator/wookie/trunk/build.xml
incubator/wookie/trunk/digsig-client/java/README.txt
Modified: incubator/wookie/trunk/build.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/build.properties?rev=1376065&r1=1376064&r2=1376065&view=diff
==============================================================================
--- incubator/wookie/trunk/build.properties (original)
+++ incubator/wookie/trunk/build.properties Wed Aug 22 14:16:18 2012
@@ -63,6 +63,7 @@ wookie.connector.dir=connector
# Wookie W3c Parser properties
wookie.parser.w3c.dir=parser
+wookie.digsig.client.w3c.dir=digsig-client
#
# Widget handling properties
#
Modified: incubator/wookie/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/build.xml?rev=1376065&r1=1376064&r2=1376065&view=diff
==============================================================================
--- incubator/wookie/trunk/build.xml (original)
+++ incubator/wookie/trunk/build.xml Wed Aug 22 14:16:18 2012
@@ -231,7 +231,11 @@
addproperty="widget.shortname"/>
<ant antfile="${wookie.widgets.dir}/${widget.shortname}/build.xml"
target="build-widget"/>
</target>
-
+
+ <target name="build-signer" description="Builds the digital signature client
app">
+ <ant dir="${wookie.digsig.client.w3c.dir}/java" target="publish-local"
inheritAll="false"/>
+ </target>
+
<target name="local-publish-subprojects" description="Publishes all sub
projects (i.e. java connector and parser projects) to the local repository
found under user.home/.m2">
<!-- localy publish sub-projects -->
<ant dir="${wookie.connector.dir}/java" target="publish-local"
inheritAll="false"/>
Modified: incubator/wookie/trunk/digsig-client/java/README.txt
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/digsig-client/java/README.txt?rev=1376065&r1=1376064&r2=1376065&view=diff
==============================================================================
--- incubator/wookie/trunk/digsig-client/java/README.txt (original)
+++ incubator/wookie/trunk/digsig-client/java/README.txt Wed Aug 22 14:16:18
2012
@@ -10,8 +10,10 @@ for more info. (Thanks to Pushpalanka Ja
Guide to the Swing based client application
===========================================
-Run "SignCoordinator" (as a standalone java app) and a swing based application
should
-appear. What follows is a brief explanation of the fields in the application.
+Run "SignCoordinator" (as a standalone java app) or you can also run the top
+level ant task 'build-signer' to generate an executable jar package.
+A swing based application should appear.
+What follows is a brief explanation of the fields in the application.
Author/Distributor
------------------
Added: incubator/wookie/trunk/digsig-client/java/build.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/digsig-client/java/build.properties?rev=1376065&view=auto
==============================================================================
--- incubator/wookie/trunk/digsig-client/java/build.properties (added)
+++ incubator/wookie/trunk/digsig-client/java/build.properties Wed Aug 22
14:16:18 2012
@@ -0,0 +1,5 @@
+version=0.12.0-incubating-SNAPSHOT
+
+# build configuration properties
+build.dir=build
+ivy.repository.dir=../../ant
Propchange: incubator/wookie/trunk/digsig-client/java/build.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/wookie/trunk/digsig-client/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/digsig-client/java/build.xml?rev=1376065&view=auto
==============================================================================
--- incubator/wookie/trunk/digsig-client/java/build.xml (added)
+++ incubator/wookie/trunk/digsig-client/java/build.xml Wed Aug 22 14:16:18 2012
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+ 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 xmlns:ivy="antlib:org.apache.ivy.ant" default="compile-core"
basedir="." name="wookie-digsig-client">
+ <description>
+ Ivy based build system for Apache Wookie W3C Widget Digital Signature
Client.
+ </description>
+
+ <property file="local.build.properties" />
+ <property file="build.properties" />
+
+ <import file="../../ant/ivy-java-common.xml" />
+
+ <ivy:cachefileset setid="signer-path" conf="deploy" />
+ <ivy:cachepath pathid="signer.classpath" conf="deploy" />
+ <property name="signer-main-class"
value="org.apache.wookie.digsig.client.SignCoordinator" />
+
+ <target name="publish-local" depends="build-client"/>
+
+ <target name="build-client" depends="compile-client">
+ <delete dir="${build.dir}"/>
+ <mkdir dir="${build.dir}"/>
+ <jar destfile="${build.dir}/signer.jar"
filesetmanifest="mergewithoutmain">
+ <manifest>
+ <attribute name="Main-Class"
value="${signer-main-class}"/>
+ <attribute name="Class-Path" value="."/>
+ <attribute name="Implementation-Vendor"
value="Apache Software Foundation"/>
+ <attribute name="Implementation-Title"
value="${ant.project.name}"/>
+ <attribute name="Implementation-Version"
value="${version}"/>
+ <attribute name="Built-By"
value="${user.name}"/>
+ <attribute name="Build-Date" value="${TODAY}"/>
+ </manifest>
+ <fileset dir="bin"/>
+ <fileset dir="resources">
+ <include name="logo.png" />
+ </fileset>
+ <zipgroupfileset refid="signer-path"/>
+ </jar>
+ </target>
+
+ <target name="compile-client">
+ <javac
+ srcdir="src"
+ destdir="bin"
+ classpathref="signer.classpath"/>
+ </target>
+</project>
\ No newline at end of file
Propchange: incubator/wookie/trunk/digsig-client/java/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/wookie/trunk/digsig-client/java/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/digsig-client/java/ivy.xml?rev=1376065&view=auto
==============================================================================
--- incubator/wookie/trunk/digsig-client/java/ivy.xml (added)
+++ incubator/wookie/trunk/digsig-client/java/ivy.xml Wed Aug 22 14:16:18 2012
@@ -0,0 +1,29 @@
+<!--
+ 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.
+-->
+<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven";>
+ <info organisation="org.apache.wookie" module="wookie-digsig-client"
+ revision="0.12.0-incubating-SNAPSHOT" />
+ <configurations>
+ <conf name="deploy" description="Provide the necessary files
and libraries to deploy" />
+ </configurations>
+ <dependencies>
+ <dependency org="org.apache.santuario" name="xmlsec" rev="1.5.2"
+ conf="deploy->default"></dependency>
+ <dependency org="org.apache.commons" name="commons-compress"
+ rev="1.0" conf="deploy->default"></dependency>
+ </dependencies>
+</ivy-module>
Propchange: incubator/wookie/trunk/digsig-client/java/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
