You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2012/01/14 09:07:32 UTC
svn commit: r1231459 - in /river/jtsk/skunk/peterConcurrentPolicy: ./
src/manifest/jsk-dl/META-INF/ src/org/apache/river/api/security/
src/org/apache/river/api/security/policy/
Author: peter_firmstone
Date: Sat Jan 14 08:07:31 2012
New Revision: 1231459
URL: http://svn.apache.org/viewvc?rev=1231459&view=rev
Log:
River-365
Tidy up build, removed creation of Jini 1.0 jar files and unnecessary stub generation. Stub generation has been retained for Phoenix and start.
Removed:
river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/policy/
Modified:
river/jtsk/skunk/peterConcurrentPolicy/build.xml
river/jtsk/skunk/peterConcurrentPolicy/src/manifest/jsk-dl/META-INF/PREFERRED.LIST
river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ConcurrentPermissions.java
river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/Messages.java
Modified: river/jtsk/skunk/peterConcurrentPolicy/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/build.xml?rev=1231459&r1=1231458&r2=1231459&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/build.xml (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/build.xml Sat Jan 14 08:07:31 2012
@@ -468,14 +468,17 @@
browser.jars" />
<target name="river.jars" depends="stubs,
- jini-core.jar,
- jini-ext.jar,
jsk-dl.jar,
jsk-lib.jar,
jsk-resources.jar,
jsk-platform.jar,
- jsk-policy.jar,
- sun-util.jar" />
+ jsk-policy.jar" />
+
+ <!-- old river.jars entrys deprecated removed.
+ jini-core.jar,
+ jini-ext.jar,
+ sun-util.jar
+ -->
<target name="services.jars" depends="toolswrappers.jars,
destroy.jar,
@@ -498,10 +501,13 @@
phoenix-init.jar,
reggie.jar,
reggie-dl.jar,
- sdm-dl.jar,
serviceui.jar,
sharedvm.jar,
start.jar" />
+
+ <!-- Old services.jars
+ sdm-dl.jar,
+ -->
<target name="browser.jars" depends="services.jars,
browser.jar,
@@ -532,9 +538,10 @@
</target>
<target name="stubs" description="Generate stubs"
- depends="compile, 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">
+ reggie.stubs, sdm.stubs, start.stubs">-->
</target>
<target name="clean" depends="clean-dist, clean-jars, doc-clean"
@@ -696,17 +703,17 @@
<!--
Deprecated since 2.1 - Scheduled for removal (RIVER-365)
-->
- <target name="jini-core.jar" depends="stubs">
+ <!--<target name="jini-core.jar" depends="stubs">
<jar destfile="${lib.dir}/jini-core.jar" index="false">
<fileset dir="${build.classes.dir}"
includes="net/jini/core/**"/>
</jar>
- </target>
+ </target>-->
<!--
Deprecated since 2.1 - Scheduled for removal (RIVER-365)
-->
- <target name="jini-ext.jar" depends="stubs">
+ <!--<target name="jini-ext.jar" depends="stubs">
<property name="jini-ext.deps" location="${build.deps.dir}/jini-ext.deps"/>
<classdep output="${jini-ext.deps}"
classpathref="classdep.classes.classpath">
@@ -725,7 +732,7 @@
manifest="${src.manifest.dir}/jini-ext.mf">
<fileset dir="${build.classes.dir}" includesfile="${jini-ext.deps}"/>
</jar>
- </target>
+ </target>-->
<target name="jsk-debug-policy.jar" depends="stubs">
@@ -786,7 +793,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">
@@ -794,7 +801,7 @@
<metainf dir="${src.manifest.dir}/jsk-dl/META-INF"/>
</jar>
</target>
-
+ <!-- QA suite deps are from sun-util.jar-->
<target name="jsk-lib.jar" depends="stubs">
<property name="jsk-lib.deps" location="${build.deps.dir}/jsk-lib.deps"/>
<classdep output="${jsk-lib.deps}"
@@ -807,6 +814,7 @@
<arg line="${jskplatform.exclude}"/>
<arg path="${build.classes.dir}/com/sun/jini/admin"/>
<arg path="${build.classes.dir}/com/sun/jini/config"/>
+ <arg path="${build.classes.dir}/com/sun/jini/constants"/> <!--qa suite dep-->
<arg path="${build.classes.dir}/com/sun/jini/landlord"/>
<arg path="${build.classes.dir}/com/sun/jini/lease"/>
<arg path="${build.classes.dir}/com/sun/jini/lookup/entry"/>
@@ -814,6 +822,7 @@
<arg path="${build.classes.dir}/com/sun/jini/reliableLog"/>
<arg path="${build.classes.dir}/com/sun/jini/resource"/>
<arg path="${build.classes.dir}/com/sun/jini/thread"/>
+ <arg path="${build.classes.dir}/com/sun/jini/system"/> <!--qa suite dep-->
<arg path="${build.classes.dir}/net/jini"/>
<arg value="com.sun.jini.logging.Levels"/>
<arg value="com.sun.jini.phoenix.ActivationAdmin"/>
@@ -923,6 +932,9 @@
<jar destfile="${lib-ext.dir}/jsk-policy.jar"
index="false">
<fileset dir="${build.classes.dir}" includesfile="${jsk-policy.deps}"/>
+ <fileset dir="${src.dir}">
+ <include name="org/apache/river/api/security/messages.properties"/>
+ </fileset>
</jar>
</target>
@@ -942,7 +954,7 @@
Deprecated since 2.1 - Scheduled for removal
Note: the QA suite depends on some of the classes in sun-util.jar
-->
- <target name="sun-util.jar" depends="stubs">
+ <!--<target name="sun-util.jar" depends="stubs">
<property name="sun-util.deps" location="${build.deps.dir}/sun-util.deps"/>
<classdep output="${sun-util.deps}"
classpathref="classdep.classes.classpath">
@@ -977,12 +989,12 @@
com/sun/jini/system/**
com/sun/jini/thread/**"/>
</jar>
- </target>
+ </target>-->
<!--
Deprecated since 2.1 - Scheduled for removal
-->
- <target name="sdm-dl.jar" depends="stubs">
+ <!--<target name="sdm-dl.jar" depends="stubs">
<property name="sdm-dl.deps" location="${build.deps.dir}/sdm-dl.deps"/>
<classdep output="${sdm-dl.deps}">
<arg value="-cp"/>
@@ -1008,14 +1020,14 @@
<arg line="-proxy net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
<classpath refid="river.jars"/>
</preferredlistgen>
- </target>
+ </target>-->
- <target name="sdm.stubs" depends="compile">
+ <!--<target name="sdm.stubs" depends="compile">
<rmic base="${build.classes.dir}" stubversion="1.2">
<classpath refid="river.jars"/>
<include name="net/jini/lookup/ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener.class"/>
</rmic>
- </target>
+ </target>-->
<patternset id="svc-common-entries-set">
<include name="JoinManager"/>
@@ -1369,8 +1381,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"
@@ -1387,8 +1399,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"
@@ -1402,18 +1414,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" />
@@ -1425,7 +1437,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>
@@ -1454,7 +1466,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"/>
@@ -1480,12 +1492,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" />
@@ -1499,7 +1511,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">
@@ -1532,7 +1544,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}" />
@@ -1550,12 +1562,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" />
@@ -1569,7 +1581,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">
@@ -1597,7 +1609,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"/>
@@ -1624,12 +1636,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" />
@@ -1641,7 +1653,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"/>
@@ -1673,7 +1685,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"/>
@@ -1697,12 +1709,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" />
@@ -1729,7 +1741,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>
@@ -1752,7 +1764,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"/>
@@ -1776,12 +1788,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" />
@@ -1852,7 +1864,7 @@
<arg path="${lib-dl.dir}/phoenix-dl.jar"/>
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy com.sun.jini.phoenix.AbstractSystem_Stub" />
+ <arg line="-proxy com.sun.jini.phoenix.AbstractSystem_Stub"/>
<classpath refid="river.jars"/>
</preferredlistgen>
</target>
@@ -1870,7 +1882,7 @@
<arg value="com.sun.jini.phoenix.AccessILFactory"/>
<arg value="com.sun.jini.phoenix.InstantiatorAccessExporter"/>
<arg value="com.sun.jini.phoenix.InstantiatorPermission"/>
- <arg value="com.sun.jini.phoenix.AbstractInstantiator_Stub" />
+ <arg value="com.sun.jini.phoenix.AbstractInstantiator_Stub"/>
</classdep>
<jar destfile="${lib.dir}/phoenix-group.jar" index="false">
<fileset dir="${build.classes.dir}" includesfile="${phoenix-group.deps}" />
@@ -1918,8 +1930,8 @@
<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" />
+ <!--<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">
@@ -1948,7 +1960,7 @@
<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.RegistrarImpl_Stub"/>-->
<arg value="com.sun.jini.reggie.RegistrarPermission"/>
<arg value="com.sun.jini.reggie.RegistrarProxy"/>
<arg value="com.sun.jini.reggie.Registration"/>
@@ -1971,12 +1983,12 @@
</preferredlistgen>
</target>
- <target name="reggie.stubs" depends="compile">
+ <!--<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>-->
<target name="start.copy-resources" depends="prep">
<!--
@@ -2016,7 +2028,7 @@
<arg value="-files" />
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.start"/>
- <arg value="com.sun.jini.start.SharedGroupImpl" />
+ <arg value="com.sun.jini.start.SharedGroupImpl"/>
<arg value="com.sun.jini.start.SharedGroupImpl_Stub"/>
</classdep>
<jar destfile="${lib.dir}/group.jar" index="false">
Modified: river/jtsk/skunk/peterConcurrentPolicy/src/manifest/jsk-dl/META-INF/PREFERRED.LIST
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/manifest/jsk-dl/META-INF/PREFERRED.LIST?rev=1231459&r1=1231458&r2=1231459&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/src/manifest/jsk-dl/META-INF/PREFERRED.LIST (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/src/manifest/jsk-dl/META-INF/PREFERRED.LIST Sat Jan 14 08:07:31 2012
@@ -31,3 +31,6 @@ Preferred: false
Name: net/jini/-
Preferred: false
+
+Name: org/apache/river/api/-
+Preferred: false
\ No newline at end of file
Modified: river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ConcurrentPermissions.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ConcurrentPermissions.java?rev=1231459&r1=1231458&r2=1231459&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ConcurrentPermissions.java (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/ConcurrentPermissions.java Sat Jan 14 08:07:31 2012
@@ -348,117 +348,6 @@ implements Serializable {
return null;
}
-// Permission resolve(ClassLoader cl){
-// Class<?> targetType = null;
-// try {
-// targetType = cl.loadClass(type);
-// } catch (ClassNotFoundException e){
-// //TODO log warning?
-// System.err.println(type +" " + name + " " + actions +
-// ": Cannot be resolved due to ClassNotFoundException");
-// e.printStackTrace();
-// } catch (NullPointerException e){
-// //TODO log warning, this should never happen but if it does
-// //the class will not be resolved.
-// System.err.println(type +" " + name + " " + actions +
-// ": Cannot be resolved due to ClassLoader null instance");
-// e.printStackTrace();
-// }
-// if ( targetType == null ) {return null;}
-// return resolve(targetType);
-// }
-//
-//
-// /**
-// * Code Copied, Courtesey Apache Harmony
-// *
-// * Checks whether the objects from <code>what</code> array are all
-// * presented in <code>where</code> array.
-// *
-// * @param what first array, may be <code>null</code>
-// * @param where second array, may be <code>null</code>
-// * @return <code>true</code> if the first array is <code>null</code>
-// * or if each and every object (ignoring null values)
-// * from the first array has a twin in the second array; <code>false</code> otherwise
-// */
-// boolean matchSubset(Object[] what, Object[] where) {
-// if (what == null) {
-// return true;
-// }
-//
-// for (int i = 0; i < what.length; i++) {
-// if (what[i] != null) {
-// if (where == null) {
-// return false;
-// }
-// boolean found = false;
-// for (int j = 0; j < where.length; j++) {
-// if (what[i].equals(where[j])) {
-// found = true;
-// break;
-// }
-// }
-// if (!found) {
-// return false;
-// }
-// }
-// }
-// return true;
-// }
-//
-// // Empty set of arguments to default constructor of a Permission.
-// private static final Class[] NO_ARGS = {};
-//
-// // One-arg set of arguments to default constructor of a Permission.
-// private static final Class[] ONE_ARGS = { String.class };
-//
-// // Two-args set of arguments to default constructor of a Permission.
-// private static final Class[] TWO_ARGS = { String.class, String.class };
-//
-// /**
-// * Code copied, courtsey of Apache Harmony
-// *
-// * Tries to find a suitable constructor and instantiate a new Permission
-// * with specified parameters.
-// *
-// * @param targetType class of expected Permission instance
-// * @param targetName name of expected Permission instance
-// * @param targetActions actions of expected Permission instance
-// * @return a new Permission instance
-// * @throws IllegalArgumentException if no suitable constructor found
-// * @throws Exception any exception thrown by Constructor.newInstance()
-// */
-// Permission instantiatePermission(Class<?> targetType,
-// String targetName, String targetActions) throws Exception {
-//
-// // let's guess the best order for trying constructors
-// Class[][] argTypes = null;
-// Object[][] args = null;
-// if (targetActions != null) {
-// argTypes = new Class[][] { TWO_ARGS, ONE_ARGS, NO_ARGS };
-// args = new Object[][] { { targetName, targetActions },
-// { targetName }, {} };
-// } else if (targetName != null) {
-// argTypes = new Class[][] { ONE_ARGS, TWO_ARGS, NO_ARGS };
-// args = new Object[][] { { targetName },
-// { targetName, targetActions }, {} };
-// } else {
-// argTypes = new Class[][] { NO_ARGS, ONE_ARGS, TWO_ARGS };
-// args = new Object[][] { {}, { targetName },
-// { targetName, targetActions } };
-// }
-//
-// // finally try to instantiate actual permission
-// for (int i = 0; i < argTypes.length; i++) {
-// try {
-// Constructor<?> ctor = targetType.getConstructor(argTypes[i]);
-// return (Permission)ctor.newInstance(args[i]);
-// }
-// catch (NoSuchMethodException ignore) {}
-// }
-// throw new IllegalArgumentException(type + name + actions);//$NON-NLS-1$
-// }
-
@Override
public boolean implies(Permission permission) {
return false;
Modified: river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/Messages.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/Messages.java?rev=1231459&r1=1231458&r2=1231459&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/Messages.java (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/src/org/apache/river/api/security/Messages.java Sat Jan 14 08:07:31 2012
@@ -56,7 +56,7 @@ class Messages {
ResourceBundle rb = null;
try {
rb = setLocale(Locale.getDefault(),
- "org.apache.river.impl.security.policy.util.messages"); //$NON-NLS-1$
+ "org.apache.river.api.security.messages"); //$NON-NLS-1$
} catch (Throwable e) {
System.err.println(e);
}