Author: jcosters
Date: Thu Nov 14 21:49:50 2013
New Revision: 1542098
URL: http://svn.apache.org/r1542098
Log:
RIVER-427 - Created subproject for Reggie, including Netbeans project files
Added:
river/jtsk/skunk/RIVER-427/services/
river/jtsk/skunk/RIVER-427/services/reggie/ (with props)
river/jtsk/skunk/RIVER-427/services/reggie/build.xml
- copied, changed from r1541673,
river/jtsk/skunk/RIVER-427/examples/hello/build.xml
river/jtsk/skunk/RIVER-427/services/reggie/nbproject/ (with props)
river/jtsk/skunk/RIVER-427/services/reggie/nbproject/project.xml
river/jtsk/skunk/RIVER-427/services/reggie/src/
river/jtsk/skunk/RIVER-427/services/reggie/src/com/
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/AdminProxy.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/AdminProxy.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ClassMapper.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ClassMapper.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ConstrainableAdminProxy.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ConstrainableAdminProxy.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ConstrainableEventLease.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ConstrainableEventLease.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ConstrainableRegistrarLeaseMap.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ConstrainableRegistrarLeaseMap.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ConstrainableRegistrarProxy.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ConstrainableRegistrarProxy.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ConstrainableRegistration.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ConstrainableRegistration.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ConstrainableServiceLease.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ConstrainableServiceLease.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/EntryClass.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/EntryClass.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/EntryClassBase.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/EntryClassBase.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/EntryRep.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/EntryRep.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/EventLease.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/EventLease.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/Item.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/Item.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/Matches.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/Matches.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/PersistentRegistrarImpl.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/PersistentRegistrarImpl.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ProxyVerifier.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ProxyVerifier.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/Registrar.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/Registrar.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/RegistrarEvent.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/RegistrarEvent.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/RegistrarImpl.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/RegistrarImpl.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/RegistrarLease.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/RegistrarLease.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/RegistrarLeaseMap.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/RegistrarLeaseMap.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/RegistrarPermission.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/RegistrarPermission.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/RegistrarProxy.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/RegistrarProxy.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/Registration.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/Registration.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/RenewResults.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/RenewResults.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ServiceLease.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ServiceLease.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ServiceType.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ServiceType.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/ServiceTypeBase.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/ServiceTypeBase.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/Template.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/Template.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/TransientRegistrarImpl.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/TransientRegistrarImpl.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/Util.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/Util.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/UuidGenerator.java
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/UuidGenerator.java
river/jtsk/skunk/RIVER-427/services/reggie/src/com/sun/jini/reggie/package.html
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/com/sun/jini/reggie/package.html
river/jtsk/skunk/RIVER-427/services/reggie/src/manifest/
river/jtsk/skunk/RIVER-427/services/reggie/src/manifest/reggie.mf
- copied unchanged from r1541673,
river/jtsk/skunk/RIVER-427/src/manifest/reggie.mf
Modified:
river/jtsk/skunk/RIVER-427/build.xml
river/jtsk/skunk/RIVER-427/common.xml
river/jtsk/skunk/RIVER-427/examples/hello/build.xml
river/jtsk/skunk/RIVER-427/examples/hello/nbproject/ (props changed)
river/jtsk/skunk/RIVER-427/qa/build.xml
river/jtsk/skunk/RIVER-427/qa/nbproject/ (props changed)
Modified: river/jtsk/skunk/RIVER-427/build.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RIVER-427/build.xml?rev=1542098&r1=1542097&r2=1542098&view=diff
==============================================================================
--- river/jtsk/skunk/RIVER-427/build.xml (original)
+++ river/jtsk/skunk/RIVER-427/build.xml Thu Nov 14 21:49:50 2013
@@ -508,8 +508,6 @@
phoenix-dl.jar,
phoenix-group.jar,
phoenix-init.jar,
- reggie.jar,
- reggie-dl.jar,
serviceui.jar,
sharedvm.jar,
start.jar" />
@@ -551,10 +549,9 @@
</target>-->
<target name="stubs" description="Generate stubs"
- depends="compile, phoenix.stubs, start.stubs">
- <!-- , browser.stubs, fiddler.stubs, mahalo.stubs,
+ depends="compile, phoenix.stubs, start.stubs, browser.stubs,
fiddler.stubs, mahalo.stubs,
mercury.stubs, norm.stubs, outrigger.stubs, phoenix.stubs,
- reggie.stubs, sdm.stubs, start.stubs">-->
+ start.stubs">
</target>
<target name="clean" depends="clean-dist, clean-jars, doc-clean"
@@ -771,7 +768,7 @@
<arg value="net.jini.lease.LeaseUnmarshalException"/>
<arg value="net.jini.lease.RenewalFailureEvent"/>
<arg value="net.jini.lookup.DiscoveryAdmin"/>
- <!--<arg
value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>-->
+ <arg
value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
</classdep>
<jar destfile="${lib-dl.dir}/jsk-dl.jar"
index="false">
@@ -1281,8 +1278,8 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.example.browser"/>
<arg value="com.sun.jini.example.browser.Browser"/>
- <!--<arg
value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>-->
- <!--<arg
value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>-->
+ <arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
+ <arg
value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
</classdep>
<jar destfile="${lib.dir}/browser.jar"
index="false"
@@ -1299,8 +1296,8 @@
<arg value="-files"/>
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.example.browser"/>
- <!--<arg
value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>-->
- <!--<arg
value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>-->
+ <arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
+ <arg
value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
<arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
</classdep>
<jar destfile="${lib-dl.dir}/browser-dl.jar"
@@ -1314,18 +1311,18 @@
<arg path="${lib-dl.dir}/browser-dl.jar"/>
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <!--<arg line="-proxy
com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>-->
+ <arg line="-proxy
com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
<classpath refid="river.jars"/>
</preferredlistgen>
</target>
- <!--<target name="browser.stubs" depends="compile">
+ <target name="browser.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars"/>
<include
name="com/sun/jini/example/browser/Browser$$Listener.class"/>
<include
name="com/sun/jini/example/browser/ServiceEditor$$NotifyReceiver.class"/>
</rmic>
- </target>-->
+ </target>
<target name="fiddler.jar" depends="stubs">
<property name="fiddler.deps"
location="${build.deps.dir}/fiddler.deps" />
@@ -1337,7 +1334,7 @@
<arg line="-in com.sun.jini.fiddler"/>
<arg value="com.sun.jini.fiddler.ActivatableFiddlerImpl"/>
<arg value="com.sun.jini.fiddler.FiddlerPermission" />
- <!--<arg value="com.sun.jini.fiddler.FiddlerImpl_Stub"/>-->
+ <arg value="com.sun.jini.fiddler.FiddlerImpl_Stub"/>
<arg value="com.sun.jini.fiddler.NonActivatableFiddlerImpl"
/>
<arg value="com.sun.jini.fiddler.TransientFiddlerImpl"/>
</classdep>
@@ -1366,7 +1363,7 @@
<arg line="-in com.sun.jini.fiddler"/>
<arg value="com.sun.jini.fiddler.FiddlerAdminProxy" />
<arg value="com.sun.jini.fiddler.FiddlerImpl$$FiddlerStatus"/>
- <!--<arg value="com.sun.jini.fiddler.FiddlerImpl_Stub"/>-->
+ <arg value="com.sun.jini.fiddler.FiddlerImpl_Stub"/>
<arg value="com.sun.jini.fiddler.FiddlerLease"/>
<arg value="com.sun.jini.fiddler.FiddlerProxy"/>
<arg value="com.sun.jini.fiddler.FiddlerRegistration"/>
@@ -1392,12 +1389,12 @@
</preferredlistgen>
</target>
- <!--<target name="fiddler.stubs" depends="compile">
+ <target name="fiddler.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/fiddler/FiddlerImpl.class" />
</rmic>
- </target>-->
+ </target>
<target name="mahalo.jar" depends="stubs">
<property name="mahalo.deps" location="${build.deps.dir}/mahalo.deps"
/>
@@ -1411,7 +1408,7 @@
<arg value="com.sun.jini.mahalo.NonActivatableMahaloImpl"/>
<arg value="com.sun.jini.mahalo.TransientMahaloImpl"/>
<arg value="com.sun.jini.mahalo.MahaloPermission"/>
- <!--<arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>-->
+ <arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>
</classdep>
<jar destfile="${lib.dir}/mahalo.jar" index="false"
manifest="${src.manifest.dir}/mahalo.mf">
@@ -1444,7 +1441,7 @@
<arg value="com.sun.jini.lookup.entry.BasicServiceType" />
<arg value="com.sun.jini.mahalo.TxnMgrAdminProxy"/>
<arg value="com.sun.jini.mahalo.InternalManagerException"/>
- <!--<arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>-->
+ <arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>
</classdep>
<jar destfile="${lib-dl.dir}/mahalo-dl.jar" index="false">
<fileset dir="${build.classes.dir}"
includesfile="${mahalo-dl.deps}" />
@@ -1462,12 +1459,12 @@
</preferredlistgen>
</target>
- <!--<target name="mahalo.stubs" depends="compile">
+ <target name="mahalo.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/mahalo/TxnManagerImpl.class" />
</rmic>
- </target>-->
+ </target>
<target name="mercury.jar" depends="stubs">
<property name="mercury.deps"
location="${build.deps.dir}/mercury.deps" />
@@ -1481,7 +1478,7 @@
<arg value="com.sun.jini.mercury.NonActivatableMercuryImpl"
/>
<arg value="com.sun.jini.mercury.TransientMercuryImpl"/>
<arg value="com.sun.jini.mercury.MercuryPermission" />
- <!--<arg value="com.sun.jini.mercury.MailboxImpl_Stub"/>-->
+ <arg value="com.sun.jini.mercury.MailboxImpl_Stub"/>
</classdep>
<jar destfile="${lib.dir}/mercury.jar" index="false"
manifest="${src.manifest.dir}/mercury.mf">
@@ -1509,7 +1506,7 @@
<arg value="com.sun.jini.mercury.InternalMailboxException" />
<arg value="com.sun.jini.mercury.ListenerProxy" />
<arg value="com.sun.jini.mercury.MailboxAdminProxy" />
- <!--<arg value="com.sun.jini.mercury.MailboxImpl_Stub"/>-->
+ <arg value="com.sun.jini.mercury.MailboxImpl_Stub"/>
<arg value="com.sun.jini.mercury.MailboxProxy"/>
<arg value="com.sun.jini.mercury.MercuryPermission" />
<arg value="com.sun.jini.mercury.RemoteEventDataCursor"/>
@@ -1536,12 +1533,12 @@
</preferredlistgen>
</target>
- <!--<target name="mercury.stubs" depends="compile">
+ <target name="mercury.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/mercury/MailboxImpl.class" />
</rmic>
- </target>-->
+ </target>
<target name="norm.jar" depends="stubs">
<property name="norm.deps" location="${build.deps.dir}/norm.deps" />
@@ -1553,7 +1550,7 @@
<arg line="-in com.sun.jini.norm"/>
<arg value="com.sun.jini.norm.ActivatableNormServerImpl"/>
<arg value="com.sun.jini.norm.NormPermission"/>
- <!--<arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>-->
+ <arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>
<arg value="com.sun.jini.norm.PersistentNormServerImpl"/>
<arg value="com.sun.jini.norm.TransientNormServerImpl"/>
<arg value="com.sun.jini.reliableLog.LogException"/>
@@ -1585,7 +1582,7 @@
<arg value="com.sun.jini.norm.CorruptedStoreException"/>
<arg value="com.sun.jini.norm.InternalNormException"/>
<arg value="com.sun.jini.norm.NormPermission"/>
- <!--<arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>-->
+ <arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>
<arg value="com.sun.jini.norm.ProxyVerifier"/>
<arg value="com.sun.jini.reliableLog.LogException"/>
<arg value="com.sun.jini.start.ServiceProxyAccessor"/>
@@ -1609,12 +1606,12 @@
</preferredlistgen>
</target>
- <!--<target name="norm.stubs" depends="compile">
+ <target name="norm.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include name="com/sun/jini/norm/NormServerBaseImpl.class" />
</rmic>
- </target>-->
+ </target>
<target name="outrigger-snaplogstore.jar" depends="stubs">
<property name="outrigger-snaplogstore.deps"
location="${build.deps.dir}/outrigger-snaplogstore.deps" />
@@ -1641,7 +1638,7 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.outrigger"/>
<arg value="com.sun.jini.outrigger.OutriggerPermission"/>
- <!--<arg
value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub" />-->
+ <arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub"
/>
<arg value="com.sun.jini.outrigger.PersistentOutriggerImpl"
/>
<arg value="com.sun.jini.outrigger.TransientOutriggerImpl"/>
</classdep>
@@ -1664,7 +1661,7 @@
<arg value="com.sun.jini.lookup.entry.BasicServiceType"/>
<arg value="com.sun.jini.outrigger.OutriggerPermission"/>
<arg value="com.sun.jini.outrigger.OutriggerQueryCookie"/>
- <!--<arg
value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub"/>-->
+ <arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub"/>
<arg value="com.sun.jini.outrigger.OutriggerAvailabilityEvent"/>
<arg value="com.sun.jini.outrigger.ProxyVerifier"/>
<arg value="net.jini.lookup.entry.ServiceInfo"/>
@@ -1688,12 +1685,12 @@
</preferredlistgen>
</target>
- <!--<target name="outrigger.stubs" depends="compile">
+ <target name="outrigger.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars" />
<include
name="com/sun/jini/outrigger/OutriggerServerWrapper.class" />
</rmic>
- </target>-->
+ </target>
<target name="phoenix.jar" depends="tools.jar">
<property name="phoenix.deps"
location="${build.deps.dir}/phoenix.deps" />
@@ -1820,75 +1817,9 @@
</rmic>
</target>
- <target name="reggie.jar" depends="stubs">
- <property name="reggie.deps" location="${build.deps.dir}/reggie.deps"
/>
- <classdep output="${reggie.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files" />
- <arg line="${jskprivate.include}"/>
- <arg line="-in com.sun.jini.reggie" />
- <arg value="com.sun.jini.reggie.PersistentRegistrarImpl"/>
- <arg value="com.sun.jini.reggie.RegistrarPermission"/>
- <!--<arg value="com.sun.jini.reggie.RegistrarImpl_Stub"/>-->
- <arg value="com.sun.jini.reggie.TransientRegistrarImpl"/>
- </classdep>
- <jar destfile="${lib.dir}/reggie.jar" index="false"
- manifest="${src.manifest.dir}/reggie.mf">
- <fileset dir="${build.classes.dir}" includesfile="${reggie.deps}"
/>
- </jar>
- <preferredlistgen>
- <arg line="-cp" />
- <arg path="${build.classes.dir}"/>
- <arg line="-jar"/>
- <arg path="${lib.dir}/reggie.jar"/>
- <arg line="-default true" />
- <classpath refid="river.jars"/>
- </preferredlistgen>
- </target>
-
- <target name="reggie-dl.jar" depends="stubs">
- <property name="reggie-dl.deps"
location="${build.deps.dir}/reggie-dl.deps" />
- <classdep output="${reggie-dl.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files" />
- <arg line="${jskprivate.include}"/>
- <arg line="-in com.sun.jini.reggie"/>
- <arg value="com.sun.jini.lookup.entry.BasicServiceType"/>
- <arg value="com.sun.jini.reggie.AdminProxy" />
- <arg value="com.sun.jini.reggie.EventLease"/>
- <arg value="com.sun.jini.reggie.ProxyVerifier"/>
- <arg value="com.sun.jini.reggie.RegistrarEvent"/>
- <!--<arg value="com.sun.jini.reggie.RegistrarImpl_Stub"/>-->
- <arg value="com.sun.jini.reggie.RegistrarPermission"/>
- <arg value="com.sun.jini.reggie.RegistrarProxy"/>
- <arg value="com.sun.jini.reggie.Registration"/>
- <arg value="com.sun.jini.reliableLog.LogException"/>
- <arg value="net.jini.lookup.entry.ServiceInfo"/>
- </classdep>
- <jar destfile="${lib-dl.dir}/reggie-dl.jar" index="false">
- <fileset dir="${build.classes.dir}"
includesfile="${reggie-dl.deps}" />
- </jar>
- <preferredlistgen>
- <arg line="-cp" />
- <arg path="${build.classes.dir}"/>
- <arg line="-jar"/>
- <arg path="${lib-dl.dir}/reggie-dl.jar"/>
- <arg line="-jar"/>
- <arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy
com.sun.jini.reggie.ConstrainableRegistrarProxy"/>
- <arg line="-proxy com.sun.jini.reggie.ConstrainableAdminProxy"/>
- <classpath refid="river.jars"/>
- </preferredlistgen>
- </target>
+
- <!--<target name="reggie.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/reggie/RegistrarImpl.class" />
- </rmic>
- </target>-->
+
<target name="start.copy-resources" depends="prep">
<!--
@@ -2105,7 +2036,9 @@
<target name="all.build" depends="river-runtime"
description="Build all, including subcomponents">
- <!-- Call qa subcomponent build -->
+ <!-- Call reggie subcomponent build -->
+ <ant dir="services/reggie" target="build" inheritall="false" />
+ <!-- Call qa subcomponent build -->
<ant dir="qa" target="build" inheritall="false" />
<!-- Call examples/hello subcomponent build -->
<ant dir="examples/hello" target="build" inheritall="false" />
@@ -2113,6 +2046,8 @@
<target name="all.clean" depends="clean,clean-tests"
description="Clean all, including subcomponents">
+ <!-- Call reggie subcomponent build -->
+ <ant dir="services/reggie" target="clean" inheritall="false" />
<!-- Call qa subcomponent build -->
<ant dir="qa" target="clean" inheritall="false" />
<!-- Call examples/hello subcomponent build -->
@@ -2121,6 +2056,8 @@
<target name="all.compile" depends="jars"
description="Compile all, including subcomponents">
+ <!-- Call reggie subcomponent build -->
+ <ant dir="services/reggie" target="compile" inheritall="false" />
<!-- Call qa subcomponent build -->
<ant dir="qa" target="compile" inheritall="false" />
<!-- Call examples/hello subcomponent build -->
@@ -2129,6 +2066,8 @@
<target name="all.doc" depends="jars,river-doc"
description="Generate javadoc for all, including subcomponents">
+ <!-- Call reggie subcomponent build -->
+ <ant dir="services/reggie" target="doc" inheritall="false" />
<!-- Call qa subcomponent build -->
<ant dir="qa" target="doc" inheritall="false" />
<!-- Call examples/hello subcomponent build -->
@@ -2137,6 +2076,8 @@
<target name="all.jars" depends="jars"
description="Generate JAR files for all, including subcomponents">
+ <!-- Call reggie subcomponent build -->
+ <ant dir="services/reggie" target="jars" inheritall="false" />
<!-- Call qa subcomponent build -->
<ant dir="qa" target="jars" inheritall="false" />
<!-- Call examples/hello subcomponent build -->
Modified: river/jtsk/skunk/RIVER-427/common.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RIVER-427/common.xml?rev=1542098&r1=1542097&r2=1542098&view=diff
==============================================================================
--- river/jtsk/skunk/RIVER-427/common.xml (original)
+++ river/jtsk/skunk/RIVER-427/common.xml Thu Nov 14 21:49:50 2013
@@ -101,6 +101,7 @@
<property name="river.home" location="${root}"/>
<property name="river.lib.dir" location="${river.home}/${lib}"/>
<property name="river.lib-ext.dir" location="${river.home}/${lib-ext}"/>
+ <property name="river.lib-dl.dir" location="${river.home}/${lib-dl}"/>
<property name="river.classes.dir"
location="${river.home}/${build.classes}"/>
<property name="river.src.dir" location="${river.home}/${src}"/>
@@ -184,6 +185,14 @@
<path id="jarwrapper.classpath">
<path refid="jarwrapper.jar.classpath" />
</path>
+
+ <path id="preferredlistgen.jar">
+ <pathelement location="${river.lib.dir}/preferredlistgen.jar"/>
+ </path>
+
+ <path id="preferredlistgen.classpath">
+ <path refid="preferredlistgen.jar" />
+ </path>
<path id="test.compile.classpath">
<path location="${build.classes.dir}"/>
@@ -230,10 +239,12 @@
</macrodef>
<macrodef name="preferredlistgen" description="Run PreferredListGen">
+ <attribute name="classpathref" default="preferredlistgen.classpath" />
<element name="plg-elements" implicit="true"/>
<sequential>
<java classname="com.sun.jini.tool.PreferredListGen"
fork="true" failonerror="true" >
+ <classpath refid="@{classpathref}"/>
<plg-elements/>
</java>
</sequential>
Modified: river/jtsk/skunk/RIVER-427/examples/hello/build.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RIVER-427/examples/hello/build.xml?rev=1542098&r1=1542097&r2=1542098&view=diff
==============================================================================
--- river/jtsk/skunk/RIVER-427/examples/hello/build.xml (original)
+++ river/jtsk/skunk/RIVER-427/examples/hello/build.xml Thu Nov 14 21:49:50 2013
@@ -62,7 +62,7 @@
</javac-cmd>
</target>
- <target name="prep" description="Prepare the build">
+ <target name="prep" description="Prepare the build">
<mkdir dir="${build.dir}" />
<mkdir dir="${build.classes.dir}" />
<mkdir dir="${build.deps.dir}" />
@@ -97,16 +97,16 @@
<copy file="${root}/NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE"/>
</target>
- <target name="jars"
+ <target name="jars"
depends="client.jar,
mdprefld.jar,
server.jar,
server-act.jar,
server-dl.jar">
- </target>
+ </target>
- <target name="client.jar" depends="stubs">
+ <target name="client.jar" depends="stubs">
<property name="example-client.deps"
location="${build.deps.dir}/example-client.deps"/>
<classdep output="${example-client.deps}">
<arg value="-cp"/>
Propchange: river/jtsk/skunk/RIVER-427/examples/hello/nbproject/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 14 21:49:50 2013
@@ -0,0 +1 @@
+private
Modified: river/jtsk/skunk/RIVER-427/qa/build.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RIVER-427/qa/build.xml?rev=1542098&r1=1542097&r2=1542098&view=diff
==============================================================================
--- river/jtsk/skunk/RIVER-427/qa/build.xml (original)
+++ river/jtsk/skunk/RIVER-427/qa/build.xml Thu Nov 14 21:49:50 2013
@@ -171,6 +171,12 @@
<mkdir dir="${lib.dir}" />
<mkdir dir="${lib-ext.dir}" />
</target>
+
+ <!-- temp hack to make QA suite run properly -->
+ <target name="-copy-reggie-libs" description="Copy dependencies"
depends="prep">
+ <copy file="../services/reggie/lib/reggie.jar"
todir="${river.lib.dir}"/>
+ <copy file="../services/reggie/lib-dl/reggie-dl.jar"
todir="${river.lib-dl.dir}"/>
+ </target>
<target name="copy-resources" depends="prep">
<copy todir="${build.classes.dir}">
@@ -178,7 +184,7 @@
</copy>
</target>
- <target name="compile" depends="copy-resources" description="Build
classes">
+ <target name="compile" depends="copy-resources,-copy-reggie-libs"
description="Build classes">
<property name="qa.source" value="5" />
<property name="qa.target" value="jsr14" />
<javac-cmd source="${qa.source}" target="${qa.target}"
source.dir="${src.dir}" dest.dir="${build.classes.dir}">
Propchange: river/jtsk/skunk/RIVER-427/qa/nbproject/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 14 21:49:50 2013
@@ -0,0 +1 @@
+private
Propchange: river/jtsk/skunk/RIVER-427/services/reggie/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 14 21:49:50 2013
@@ -0,0 +1,4 @@
+lib
+doc
+build
+lib-dl
Copied: river/jtsk/skunk/RIVER-427/services/reggie/build.xml (from r1541673,
river/jtsk/skunk/RIVER-427/examples/hello/build.xml)
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RIVER-427/services/reggie/build.xml?p2=river/jtsk/skunk/RIVER-427/services/reggie/build.xml&p1=river/jtsk/skunk/RIVER-427/examples/hello/build.xml&r1=1541673&r2=1542098&rev=1542098&view=diff
==============================================================================
--- river/jtsk/skunk/RIVER-427/examples/hello/build.xml (original)
+++ river/jtsk/skunk/RIVER-427/services/reggie/build.xml Thu Nov 14 21:49:50
2013
@@ -16,58 +16,60 @@
! limitations under the License.
!-->
-<project name="hello" basedir="." default="build">
+<project name="reggie" basedir="." default="build">
<description>This Ant scripts provides numerous tasks to build the
- the Hello Example</description>
+ the Reggie lookup service implementation</description>
<!-- Root of the River source distribution -->
<property name="root" location="../.." />
- <!-- Override this to build/run hello example against an external River
installation -->
+ <!-- Override this to build/run Reggie against an external River
installation -->
<property name="river.home" location="${root}"/>
<!-- Import common settings and macros -->
<import file="${root}/common.xml"/>
<!-- javadoc setings -->
- <property name="javadoc.doc-title" value="Apache River v${version} Hello
Example API Documentation"/>
+ <property name="javadoc.doc-title" value="Apache River v${version} Reggie
API Documentation"/>
<property name="javadoc.win-title" value="${javadoc.doc-title}"/>
-
+
+ <property name="jsk-lib.jar" location="${lib.dir}/jsk-lib.jar" />
+ <property name="jsk-platform.jar" location="${lib.dir}/jsk-platform.jar" />
+
<!-- classpath searched by ClassDep -->
- <path id="classdep.cp">
- <path refid="river.jars"/>
+ <path id="compile.classpath">
<pathelement location="${build.classes.dir}"/>
+ <pathelement path="${jsk-lib.jar}"/>
+ <pathelement path="${jsk-platform.jar}"/>
</path>
-
- <path id="javadoc.classpath">
- <path refid="river.jars"/>
- <pathelement location="${build.classes.dir}"/>
- </path>
-
- <property name="config.dir" location="config"/>
- <property name="trust.dir" location="prebuiltkeys"/>
- <target name="clean" depends=""
+ <target name="clean" depends=""
description="Removes all files and dirs created by the build">
<delete dir="${build.dir}"/>
<delete dir="${lib.dir}"/>
+ <delete dir="${lib-dl.dir}"/>
<delete dir="${doc.dir}"/>
- <delete dir="${trust.dir}"/>
</target>
- <target name="compile" depends="prep" description="Build classes">
+ <target name="compile" depends="copy-libs" description="Build classes">
<javac-cmd source.dir="${src.dir}" dest.dir="${build.classes.dir}">
- <classpath refid="river.jars"/>
+ <classpath refid="compile.classpath"/>
</javac-cmd>
</target>
-
- <target name="prep" description="Prepare the build">
+
+ <target name="copy-libs" description="Copy dependencies" depends="prep">
+ <copy file="${river.lib.dir}/jsk-lib.jar" todir="${lib.dir}"/>
+ <copy file="${river.lib.dir}/jsk-platform.jar" todir="${lib.dir}"/>
+ <copy file="${river.lib-dl.dir}/jsk-dl.jar" todir="${lib-dl.dir}"/>
+ </target>
+
+ <target name="prep" description="Prepare the build">
<mkdir dir="${build.dir}" />
<mkdir dir="${build.classes.dir}" />
<mkdir dir="${build.deps.dir}" />
<mkdir dir="${lib.dir}" />
- <mkdir dir="${trust.dir}" />
+ <mkdir dir="${lib-dl.dir}" />
</target>
<target name="doc" depends="compile"
@@ -80,199 +82,92 @@
destdir="${doc.api.dir}"
doctitle="${javadoc.doc-title}"
serialwarn="false"
- source="1.4"
+ source="6"
linkoffline="${jdk.doc.url} ${jdk.packages}"
use="true"
version="true"
windowtitle="${javadoc.win-title}">
<bottom><![CDATA[${api.copyright}]]></bottom>
- <classpath refid="javadoc.classpath"/>
+ <classpath refid="compile.classpath"/>
<sourcepath>
<pathelement path="${src.dir}"/>
</sourcepath>
- <package name="com.sun.jini.example.hello.*"/>
+ <package name="com.sun.jini.reggie.*"/>
</javadoc>
-
<mkdir dir="${doc.api.dir}/doc-files"/>
- <copy file="${root}/NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE"/>
- </target>
-
- <target name="jars"
- depends="client.jar,
- mdprefld.jar,
- server.jar,
- server-act.jar,
- server-dl.jar">
-
- </target>
-
- <target name="client.jar" depends="stubs">
- <property name="example-client.deps"
location="${build.deps.dir}/example-client.deps"/>
- <classdep output="${example-client.deps}">
- <arg value="-cp"/>
- <arg pathref="classdep.cp"/>
- <arg value="-files"/>
- <arg line="${jskplatform.exclude}"/>
- <arg line="-in net.jini"/>
- <arg line="-in com.sun.jini"/>
- <arg value="com.sun.jini.example.hello.Client"/>
- </classdep>
- <delete file="${lib.dir}/client.jar" quiet="true"/>
- <jar destfile="${lib.dir}/client.jar"
- index="false"
- manifest="client.mf">
- <fileset dir="${build.classes.dir}"
includesfile="${example-client.deps}"/>
- </jar>
</target>
-
- <target name="mdprefld.jar" depends="compile">
- <delete file="${lib.dir}/mdprefld.jar" quiet="true"/>
- <jar destfile="${lib.dir}/mdprefld.jar"
- index="false">
- <fileset dir="${build.classes.dir}"
-
includes="com/sun/jini/example/hello/MdClassAnnotationProvider.class"/>
- </jar>
+
+ <target name="stubs" depends="compile">
+ <rmic base="${build.classes.dir}" stubversion="1.2">
+ <classpath refid="compile.classpath" />
+ <include name="com/sun/jini/reggie/RegistrarImpl.class" />
+ </rmic>
</target>
-
- <target name="server.jar" depends="stubs">
- <property name="example-server.deps"
location="${build.deps.dir}/example-server.deps"/>
- <classdep output="${example-server.deps}">
+
+ <target name="jars" depends="reggie.jar, reggie-dl.jar" />
+
+ <target name="reggie.jar" depends="stubs">
+ <property name="reggie.deps" location="${build.deps.dir}/reggie.deps"
/>
+ <classdep output="${reggie.deps}">
<arg value="-cp"/>
- <arg pathref="classdep.cp"/>
- <arg value="-files"/>
- <arg line="${jskplatform.exclude}"/>
- <arg line="-in net.jini"/>
- <arg line="-in com.sun.jini"/>
- <arg value="com.sun.jini.example.hello.Server"/>
- <arg value="com.sun.jini.example.hello.Server_Stub"/>
- <arg value="com.sun.jini.example.hello.ConfirmingILFactory"/>
- <arg
value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
- <arg value="com.sun.jini.example.hello.ServerPermission"/>
+ <arg pathref="compile.classpath"/>
+ <arg value="-files" />
+ <arg line="${jskprivate.include}"/>
+ <arg line="-in com.sun.jini.reggie" />
+ <arg value="com.sun.jini.reggie.PersistentRegistrarImpl"/>
+ <arg value="com.sun.jini.reggie.RegistrarPermission"/>
+ <arg value="com.sun.jini.reggie.RegistrarImpl_Stub"/>
+ <arg value="com.sun.jini.reggie.TransientRegistrarImpl"/>
</classdep>
- <delete file="${lib.dir}/server.jar" quiet="true"/>
- <jar destfile="${lib.dir}/server.jar"
- index="false"
- manifest="server.mf">
- <fileset dir="${build.classes.dir}"
includesfile="${example-server.deps}"/>
+ <jar destfile="${lib.dir}/reggie.jar" index="false"
+ manifest="${src.manifest.dir}/reggie.mf">
+ <fileset dir="${build.classes.dir}" includesfile="${reggie.deps}"
/>
</jar>
- </target>
-
- <target name="server-act.jar" depends="stubs">
- <property name="example-server-act.deps"
location="${build.deps.dir}/example-server-act.deps"/>
- <classdep output="${example-server-act.deps}">
+ <preferredlistgen>
<arg value="-cp"/>
- <arg pathref="classdep.cp"/>
- <arg value="-files"/>
- <arg line="${jskplatform.exclude}"/>
- <arg line="-in net.jini"/>
- <arg line="-in com.sun.jini"/>
- <arg value="com.sun.jini.example.hello.ActivatableServer"/>
- <arg value="com.sun.jini.example.hello.ConfirmingILFactory"/>
- <arg
value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
- <arg value="com.sun.jini.example.hello.Server"/>
- <arg value="com.sun.jini.example.hello.Server_Stub"/>
- <arg value="com.sun.jini.example.hello.ServerPermission"/>
- </classdep>
- <delete file="${lib.dir}/server-act.jar" quiet="true"/>
- <jar destfile="${lib.dir}/server-act.jar"
- index="false"
- manifest="server-act.mf">
- <fileset dir="${build.classes.dir}"
includesfile="${example-server-act.deps}"/>
- </jar>
+ <arg pathref="compile.classpath"/>
+ <arg line="-jar"/>
+ <arg path="${lib.dir}/reggie.jar"/>
+ <arg line="-default true" />
+ </preferredlistgen>
</target>
- <target name="server-dl.jar" depends="stubs">
- <property name="example-server-dl.deps"
location="${build.deps.dir}/example-server-dl.deps"/>
- <classdep output="${example-server-dl.deps}">
+ <target name="reggie-dl.jar" depends="stubs">
+ <property name="reggie-dl.deps"
location="${build.deps.dir}/reggie-dl.deps" />
+ <classdep output="${reggie-dl.deps}">
<arg value="-cp"/>
- <arg pathref="classdep.cp"/>
- <arg value="-files"/>
- <arg line="${jskplatform.exclude}"/>
- <arg line="-in net.jini"/>
- <arg line="-in com.sun.jini"/>
- <arg
value="com.sun.jini.example.hello.ConfirmingInvocationHandler"/>
- <arg value="com.sun.jini.example.hello.Hello"/>
- <arg value="com.sun.jini.example.hello.Proxy"/>
- <arg value="com.sun.jini.example.hello.Server_Stub"/>
- <arg value="com.sun.jini.example.hello.ServerPermission"/>
+ <arg pathref="compile.classpath"/>
+ <arg value="-files" />
+ <arg line="${jskprivate.include}"/>
+ <arg line="-in com.sun.jini.reggie"/>
+ <arg value="com.sun.jini.lookup.entry.BasicServiceType"/>
+ <arg value="com.sun.jini.reggie.AdminProxy" />
+ <arg value="com.sun.jini.reggie.EventLease"/>
+ <arg value="com.sun.jini.reggie.ProxyVerifier"/>
+ <arg value="com.sun.jini.reggie.RegistrarEvent"/>
+ <arg value="com.sun.jini.reggie.RegistrarImpl_Stub"/>
+ <arg value="com.sun.jini.reggie.RegistrarPermission"/>
+ <arg value="com.sun.jini.reggie.RegistrarProxy"/>
+ <arg value="com.sun.jini.reggie.Registration"/>
+ <arg value="com.sun.jini.reliableLog.LogException"/>
+ <arg value="net.jini.lookup.entry.ServiceInfo"/>
</classdep>
- <delete file="${lib.dir}/server-dl.jar" quiet="true"/>
- <jar destfile="${lib.dir}/server-dl.jar"
- index="false">
- <fileset dir="${build.classes.dir}"
includesfile="${example-server-dl.deps}"/>
- <metainf dir="${config.dir}/META-INF"/>
+ <jar destfile="${lib-dl.dir}/reggie-dl.jar" index="false">
+ <fileset dir="${build.classes.dir}"
includesfile="${reggie-dl.deps}" />
</jar>
+ <preferredlistgen>
+ <arg line="-cp" />
+ <arg pathref="compile.classpath"/>
+ <arg line="-jar"/>
+ <arg path="${lib-dl.dir}/reggie-dl.jar"/>
+ <arg line="-jar"/>
+ <arg path="${lib-dl.dir}/jsk-dl.jar"/>
+ <arg line="-proxy
com.sun.jini.reggie.ConstrainableRegistrarProxy"/>
+ <arg line="-proxy com.sun.jini.reggie.ConstrainableAdminProxy"/>
+ </preferredlistgen>
</target>
- <target name="stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars"/>
- <include name="com/sun/jini/example/hello/Server.class"/>
- </rmic>
- </target>
-
- <target name="trust" depends="prep,keystores,password,truststore"
- description="Generate keys, passwords and certificates"/>
-
- <target name="keystores" depends="client.keystore,
- reggie.keystore,
- phoenix.keystore,
- server.keystore" />
-
- <target name="client.keystore">
- <delete file="${trust.dir}/client.keystore" quiet="true"/>
- <keystore target="client" dir="${trust.dir}" dname="Client" />
- </target>
-
- <target name="reggie.keystore">
- <delete file="${trust.dir}/reggie.keystore" quiet="true"/>
- <keystore target="reggie" dir="${trust.dir}" dname="Reggie" />
- </target>
-
- <target name="phoenix.keystore">
- <delete file="${trust.dir}/phoenix.keystore" quiet="true"/>
- <keystore target="phoenix" dir="${trust.dir}" dname="Phoenix" />
- </target>
-
- <target name="server.keystore">
- <delete file="${trust.dir}/server.keystore" quiet="true"/>
- <keystore target="server" dir="${trust.dir}" dname="Server" />
- </target>
-
- <target name="password" depends="client.password,
- reggie.password,
- phoenix.password,
- server.password" />
-
- <target name="client.password">
- <delete file="${trust.dir}/client.password" quiet="true"/>
- <echo file="${trust.dir}/client.password" message="clientpw" />
- </target>
-
- <target name="reggie.password">
- <delete file="${trust.dir}/reggie.password" quiet="true"/>
- <echo file="${trust.dir}/reggie.password" message="reggiepw" />
- </target>
-
- <target name="phoenix.password">
- <delete file="${trust.dir}/phoenix.password" quiet="true"/>
- <echo file="${trust.dir}/phoenix.password" message="phoenixpw" />
- </target>
-
- <target name="server.password">
- <delete file="${trust.dir}/server.password" quiet="true"/>
- <echo file="${trust.dir}/server.password" message="serverpw" />
- </target>
-
- <target name="truststore">
- <delete file="${trust.dir}/truststore" quiet="true" />
- <truststore target="client" dir="${trust.dir}" />
- <truststore target="reggie" dir="${trust.dir}" />
- <truststore target="phoenix" dir="${trust.dir}" />
- <truststore target="server" dir="${trust.dir}" />
- </target>
-
- <target name="build" depends="trust,jars,doc"
+ <target name="build" depends="jars,doc"
description="Build all"/>
</project>
Propchange: river/jtsk/skunk/RIVER-427/services/reggie/nbproject/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 14 21:49:50 2013
@@ -0,0 +1 @@
+private
Added: river/jtsk/skunk/RIVER-427/services/reggie/nbproject/project.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/skunk/RIVER-427/services/reggie/nbproject/project.xml?rev=1542098&view=auto
==============================================================================
--- river/jtsk/skunk/RIVER-427/services/reggie/nbproject/project.xml (added)
+++ river/jtsk/skunk/RIVER-427/services/reggie/nbproject/project.xml Thu Nov 14
21:49:50 2013
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1";>
+ <type>org.netbeans.modules.ant.freeform</type>
+ <configuration>
+ <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1";>
+ <name>River Reggie</name>
+ </general-data>
+ <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2";>
+ <!-- Do not use Project Properties customizer when editing this
file manually.
+ To prevent the customizer from showing, create nbproject/project.properties
file and enter
+auxiliary.show.customizer=false
+property there. Adding
+auxiliary.show.customizer.message=<message>
+ will show your customized message when someone attempts to open the
customizer. -->
+ <name>River Reggie</name>
+ <properties/>
+ <folders>
+ <source-folder>
+ <label>Reggie</label>
+ <location>.</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
+ <source-folder>
+ <label>src</label>
+ <type>java</type>
+ <location>src</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
+ </folders>
+ <ide-actions>
+ <action name="build">
+ <target>jars</target>
+ </action>
+ <action name="clean">
+ <target>clean</target>
+ </action>
+ <action name="javadoc">
+ <target>doc</target>
+ </action>
+ <action name="rebuild">
+ <target>clean</target>
+ <target>jars</target>
+ </action>
+ </ide-actions>
+ <export>
+ <type>jar</type>
+ <location>lib/reggie.jar</location>
+ <build-target>jars</build-target>
+ </export>
+ <export>
+ <type>jar</type>
+ <location>lib-dl/reggie-dl.jar</location>
+ <build-target>jars</build-target>
+ </export>
+ <view>
+ <items>
+ <source-folder style="packages">
+ <label>src</label>
+ <location>src</location>
+ </source-folder>
+ <source-file>
+ <location>build.xml</location>
+ </source-file>
+ </items>
+ <context-menu>
+ <ide-action name="build"/>
+ <ide-action name="rebuild"/>
+ <ide-action name="clean"/>
+ <ide-action name="javadoc"/>
+ </context-menu>
+ </view>
+ <subprojects/>
+ </general-data>
+ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2";>
+ <compilation-unit>
+ <package-root>src</package-root>
+ <classpath
mode="compile">lib/jsk-lib.jar:lib/jsk-platform.jar</classpath>
+ <built-to>lib/reggie.jar</built-to>
+ <built-to>lib-dl/reggie-dl.jar</built-to>
+ <javadoc-built-to>doc/api</javadoc-built-to>
+ <source-level>1.5</source-level>
+ </compilation-unit>
+ </java-data>
+ </configuration>
+</project>
