You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by ni...@apache.org on 2008/12/22 11:32:17 UTC
svn commit: r728638 [1/2] - in /incubator/river/jtsk/skunk/niclas1: ./ api/
api/activation/ api/admin/src/main/java/com/ api/admin/src/main/java/net/
api/config/ api/constraint/ api/discovery/ api/entry/ api/event/src/
api/export/ api/id/ api/iiop/ api...
Author: niclas
Date: Mon Dec 22 02:32:10 2008
New Revision: 728638
URL: http://svn.apache.org/viewvc?rev=728638&view=rev
Log:
o Phase 2 in the re-organisation completed.
Added:
incubator/river/jtsk/skunk/niclas1/bed/
incubator/river/jtsk/skunk/niclas1/bed/action/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/shared/action/
incubator/river/jtsk/skunk/niclas1/bed/activation/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/activation/
incubator/river/jtsk/skunk/niclas1/bed/collection/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/shared/collection/
incubator/river/jtsk/skunk/niclas1/bed/config/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/config/
incubator/river/jtsk/skunk/niclas1/bed/constants/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/shared/constants/
incubator/river/jtsk/skunk/niclas1/bed/constraints/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/core-api/
incubator/river/jtsk/skunk/niclas1/bed/export/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/export/
incubator/river/jtsk/skunk/niclas1/bed/id/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/id/
incubator/river/jtsk/skunk/niclas1/bed/io/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/io/
incubator/river/jtsk/skunk/niclas1/bed/loader/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/loader/
incubator/river/jtsk/skunk/niclas1/bed/logging/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/shared/logging/
incubator/river/jtsk/skunk/niclas1/bed/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/proxy/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/shared/proxy/
incubator/river/jtsk/skunk/niclas1/bed/security/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/security/
incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/
incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/BasicMethodConstraints.java
incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/ConstraintTrustVerifier.java
incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/package.html
incubator/river/jtsk/skunk/niclas1/bed/service/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/shared/service/
incubator/river/jtsk/skunk/niclas1/bed/system/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/shared/system/
incubator/river/jtsk/skunk/niclas1/bed/thread/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/shared/thread/
incubator/river/jtsk/skunk/niclas1/bed/url/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/url/
incubator/river/jtsk/skunk/niclas1/core/constraints/
incubator/river/jtsk/skunk/niclas1/core/constraints/src/
incubator/river/jtsk/skunk/niclas1/core/constraints/src/main/
incubator/river/jtsk/skunk/niclas1/core/constraints/src/main/java/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/ (with props)
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/pom.xml
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/java/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/java/com/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/java/com/sun/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/java/com/sun/jini/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/java/com/sun/jini/discovery/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/discovery/src/main/java/com/sun/jini/discovery/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/src/main/java/net/jini/discovery/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/discovery/src/main/java/net/jini/discovery/
incubator/river/jtsk/skunk/niclas1/core/entry/ (with props)
incubator/river/jtsk/skunk/niclas1/core/entry/pom.xml
incubator/river/jtsk/skunk/niclas1/core/entry/src/
incubator/river/jtsk/skunk/niclas1/core/entry/src/main/
incubator/river/jtsk/skunk/niclas1/core/entry/src/main/java/
incubator/river/jtsk/skunk/niclas1/core/entry/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/core/entry/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/core/entry/src/main/java/net/jini/core/
incubator/river/jtsk/skunk/niclas1/core/entry/src/main/java/net/jini/core/entry/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/core-api/src/main/java/net/jini/core/entry/
incubator/river/jtsk/skunk/niclas1/core/entry/src/main/java/net/jini/entry/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/entry/src/main/java/net/jini/entry/
incubator/river/jtsk/skunk/niclas1/core/event/ (with props)
incubator/river/jtsk/skunk/niclas1/core/event/pom.xml
incubator/river/jtsk/skunk/niclas1/core/event/src/
incubator/river/jtsk/skunk/niclas1/core/event/src/main/
incubator/river/jtsk/skunk/niclas1/core/event/src/main/java/
incubator/river/jtsk/skunk/niclas1/core/event/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/core/event/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/core/event/src/main/java/net/jini/core/
incubator/river/jtsk/skunk/niclas1/core/event/src/main/java/net/jini/core/event/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/core-api/src/main/java/net/jini/core/event/
incubator/river/jtsk/skunk/niclas1/core/lease/ (with props)
incubator/river/jtsk/skunk/niclas1/core/lease/pom.xml
incubator/river/jtsk/skunk/niclas1/core/lease/src/
incubator/river/jtsk/skunk/niclas1/core/lease/src/main/
incubator/river/jtsk/skunk/niclas1/core/lease/src/main/java/
incubator/river/jtsk/skunk/niclas1/core/lease/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/core/lease/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/core/lease/src/main/java/net/jini/core/
incubator/river/jtsk/skunk/niclas1/core/lease/src/main/java/net/jini/core/lease/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/core-api/src/main/java/net/jini/core/lease/
incubator/river/jtsk/skunk/niclas1/core/lookup/ (with props)
incubator/river/jtsk/skunk/niclas1/core/lookup/pom.xml
incubator/river/jtsk/skunk/niclas1/core/lookup/src/
incubator/river/jtsk/skunk/niclas1/core/lookup/src/main/
incubator/river/jtsk/skunk/niclas1/core/lookup/src/main/java/
incubator/river/jtsk/skunk/niclas1/core/lookup/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/core/lookup/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/core/lookup/src/main/java/net/jini/core/
incubator/river/jtsk/skunk/niclas1/core/lookup/src/main/java/net/jini/core/lookup/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/core-api/src/main/java/net/jini/core/lookup/
incubator/river/jtsk/skunk/niclas1/core/pom.xml (contents, props changed)
- copied, changed from r728573, incubator/river/jtsk/skunk/niclas1/pom.xml
incubator/river/jtsk/skunk/niclas1/core/transaction/ (with props)
incubator/river/jtsk/skunk/niclas1/core/transaction/pom.xml
incubator/river/jtsk/skunk/niclas1/core/transaction/src/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/com/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/com/sun/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/com/sun/jini/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/com/sun/jini/constants/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/core-api/src/main/java/com/sun/jini/constants/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/net/jini/core/
incubator/river/jtsk/skunk/niclas1/core/transaction/src/main/java/net/jini/core/transaction/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/core-api/src/main/java/net/jini/core/transaction/
incubator/river/jtsk/skunk/niclas1/platform/
incubator/river/jtsk/skunk/niclas1/platform/lease/ (with props)
incubator/river/jtsk/skunk/niclas1/platform/lease/pom.xml
incubator/river/jtsk/skunk/niclas1/platform/lease/src/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/java/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/java/com/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/java/com/sun/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/java/com/sun/jini/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/java/com/sun/jini/lease/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/lease/src/main/java/com/sun/jini/lease/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/platform/lease/src/main/java/net/jini/lease/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/lease/src/main/java/net/jini/lease/
incubator/river/jtsk/skunk/niclas1/platform/lookup/ (with props)
incubator/river/jtsk/skunk/niclas1/platform/lookup/pom.xml
incubator/river/jtsk/skunk/niclas1/platform/lookup/src/
incubator/river/jtsk/skunk/niclas1/platform/lookup/src/main/
incubator/river/jtsk/skunk/niclas1/platform/lookup/src/main/java/
incubator/river/jtsk/skunk/niclas1/platform/lookup/src/main/java/com/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/lookup/src/main/java/com/
incubator/river/jtsk/skunk/niclas1/platform/lookup/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/platform/lookup/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/platform/lookup/src/main/java/net/jini/lookup/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/lookup/src/main/java/net/jini/lookup/
incubator/river/jtsk/skunk/niclas1/platform/pom.xml
incubator/river/jtsk/skunk/niclas1/poms/bed/
incubator/river/jtsk/skunk/niclas1/poms/bed/pom.xml
incubator/river/jtsk/skunk/niclas1/poms/platform/
incubator/river/jtsk/skunk/niclas1/poms/platform/pom.xml
incubator/river/jtsk/skunk/niclas1/services/eventmailbox/api/src/
- copied from r728623, incubator/river/jtsk/skunk/niclas1/api/event/src/
incubator/river/jtsk/skunk/niclas1/services/javaspaces/api/src/
incubator/river/jtsk/skunk/niclas1/services/javaspaces/api/src/main/
incubator/river/jtsk/skunk/niclas1/services/javaspaces/api/src/main/java/
incubator/river/jtsk/skunk/niclas1/services/javaspaces/api/src/main/java/net/
- copied from r728623, incubator/river/jtsk/skunk/niclas1/api/space/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/services/utilities/ (with props)
incubator/river/jtsk/skunk/niclas1/services/utilities/pom.xml
incubator/river/jtsk/skunk/niclas1/services/utilities/src/
incubator/river/jtsk/skunk/niclas1/services/utilities/src/main/
incubator/river/jtsk/skunk/niclas1/services/utilities/src/main/java/
incubator/river/jtsk/skunk/niclas1/services/utilities/src/main/java/com/
- copied from r728623, incubator/river/jtsk/skunk/niclas1/api/admin/src/main/java/com/
incubator/river/jtsk/skunk/niclas1/services/utilities/src/main/java/com/sun/jini/landlord/
- copied from r728623, incubator/river/jtsk/skunk/niclas1/shared/landlord/src/main/java/com/sun/jini/landlord/
incubator/river/jtsk/skunk/niclas1/services/utilities/src/main/java/net/
- copied from r728623, incubator/river/jtsk/skunk/niclas1/api/admin/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/tools/cmdline/ (with props)
incubator/river/jtsk/skunk/niclas1/tools/cmdline/pom.xml
incubator/river/jtsk/skunk/niclas1/tools/cmdline/src/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/tools/src/
incubator/river/jtsk/skunk/niclas1/transports/
incubator/river/jtsk/skunk/niclas1/transports/iiop/ (with props)
incubator/river/jtsk/skunk/niclas1/transports/iiop/pom.xml
incubator/river/jtsk/skunk/niclas1/transports/iiop/src/
incubator/river/jtsk/skunk/niclas1/transports/iiop/src/main/
incubator/river/jtsk/skunk/niclas1/transports/iiop/src/main/java/
incubator/river/jtsk/skunk/niclas1/transports/iiop/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/transports/iiop/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/transports/iiop/src/main/java/net/jini/iiop/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/iiop/src/main/java/net/jini/iiop/
incubator/river/jtsk/skunk/niclas1/transports/jeri/ (with props)
incubator/river/jtsk/skunk/niclas1/transports/jeri/pom.xml
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/com/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/com/sun/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/com/sun/jini/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/com/sun/jini/jeri/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/com/sun/jini/jeri/internal/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/jeri/src/main/java/com/sun/jini/jeri/internal/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/transports/jeri/src/main/java/net/jini/jeri/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/jeri/src/main/java/net/jini/jeri/
incubator/river/jtsk/skunk/niclas1/transports/jrmp/ (with props)
incubator/river/jtsk/skunk/niclas1/transports/jrmp/pom.xml
incubator/river/jtsk/skunk/niclas1/transports/jrmp/src/
incubator/river/jtsk/skunk/niclas1/transports/jrmp/src/main/
incubator/river/jtsk/skunk/niclas1/transports/jrmp/src/main/java/
incubator/river/jtsk/skunk/niclas1/transports/jrmp/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/transports/jrmp/src/main/java/net/jini/
incubator/river/jtsk/skunk/niclas1/transports/jrmp/src/main/java/net/jini/jrmp/
- copied from r728573, incubator/river/jtsk/skunk/niclas1/api/jrmp/src/main/java/net/jini/jrmp/
incubator/river/jtsk/skunk/niclas1/transports/pom.xml
Removed:
incubator/river/jtsk/skunk/niclas1/api/activation/
incubator/river/jtsk/skunk/niclas1/api/admin/src/main/java/com/
incubator/river/jtsk/skunk/niclas1/api/admin/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/api/config/
incubator/river/jtsk/skunk/niclas1/api/constraint/
incubator/river/jtsk/skunk/niclas1/api/discovery/
incubator/river/jtsk/skunk/niclas1/api/entry/
incubator/river/jtsk/skunk/niclas1/api/event/src/
incubator/river/jtsk/skunk/niclas1/api/export/
incubator/river/jtsk/skunk/niclas1/api/id/
incubator/river/jtsk/skunk/niclas1/api/iiop/
incubator/river/jtsk/skunk/niclas1/api/io/
incubator/river/jtsk/skunk/niclas1/api/jeri/
incubator/river/jtsk/skunk/niclas1/api/jrmp/
incubator/river/jtsk/skunk/niclas1/api/lease/
incubator/river/jtsk/skunk/niclas1/api/loader/
incubator/river/jtsk/skunk/niclas1/api/lookup/
incubator/river/jtsk/skunk/niclas1/api/pom.xml
incubator/river/jtsk/skunk/niclas1/api/security/
incubator/river/jtsk/skunk/niclas1/api/space/src/main/java/net/
incubator/river/jtsk/skunk/niclas1/api/url/
incubator/river/jtsk/skunk/niclas1/bed/config/src/main/java/com/sun/jini/config/ConfigUtil.java
incubator/river/jtsk/skunk/niclas1/bed/constraints/src/main/java/com/
incubator/river/jtsk/skunk/niclas1/bed/constraints/src/main/java/net/jini/core/entry/
incubator/river/jtsk/skunk/niclas1/bed/constraints/src/main/java/net/jini/core/event/
incubator/river/jtsk/skunk/niclas1/bed/constraints/src/main/java/net/jini/core/lease/
incubator/river/jtsk/skunk/niclas1/bed/constraints/src/main/java/net/jini/core/lookup/
incubator/river/jtsk/skunk/niclas1/bed/constraints/src/main/java/net/jini/core/transaction/
incubator/river/jtsk/skunk/niclas1/bed/constraints/src/main/resources/
incubator/river/jtsk/skunk/niclas1/bed/constraints/src/test/
incubator/river/jtsk/skunk/niclas1/core-api/
incubator/river/jtsk/skunk/niclas1/core/api/
incubator/river/jtsk/skunk/niclas1/core/impl/
incubator/river/jtsk/skunk/niclas1/jeri/
incubator/river/jtsk/skunk/niclas1/poms/utilities/
incubator/river/jtsk/skunk/niclas1/shared/action/
incubator/river/jtsk/skunk/niclas1/shared/collection/
incubator/river/jtsk/skunk/niclas1/shared/constants/
incubator/river/jtsk/skunk/niclas1/shared/landlord/src/main/java/com/sun/jini/landlord/
incubator/river/jtsk/skunk/niclas1/shared/logging/
incubator/river/jtsk/skunk/niclas1/shared/pom.xml
incubator/river/jtsk/skunk/niclas1/shared/proxy/
incubator/river/jtsk/skunk/niclas1/shared/service/
incubator/river/jtsk/skunk/niclas1/shared/system/
incubator/river/jtsk/skunk/niclas1/shared/thread/
incubator/river/jtsk/skunk/niclas1/tools/src/
Modified:
incubator/river/jtsk/skunk/niclas1/bed/action/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/activation/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/collection/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/config/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/constants/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/constraints/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/export/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/id/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/io/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/loader/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/logging/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/proxy/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/security/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/service/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/system/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/thread/pom.xml
incubator/river/jtsk/skunk/niclas1/bed/url/pom.xml
incubator/river/jtsk/skunk/niclas1/examples/browser/pom.xml
incubator/river/jtsk/skunk/niclas1/examples/hello/pom.xml
incubator/river/jtsk/skunk/niclas1/pom.xml
incubator/river/jtsk/skunk/niclas1/poms/pom.xml
incubator/river/jtsk/skunk/niclas1/services/eventmailbox/api/pom.xml
incubator/river/jtsk/skunk/niclas1/services/eventmailbox/mercury/pom.xml
incubator/river/jtsk/skunk/niclas1/services/javaspaces/api/pom.xml
incubator/river/jtsk/skunk/niclas1/services/javaspaces/outrigger/pom.xml
incubator/river/jtsk/skunk/niclas1/services/leaserenewal/norm/pom.xml
incubator/river/jtsk/skunk/niclas1/services/lookup/reggie/pom.xml
incubator/river/jtsk/skunk/niclas1/services/lookupdiscovery/fiddler/pom.xml
incubator/river/jtsk/skunk/niclas1/services/pom.xml
incubator/river/jtsk/skunk/niclas1/services/transaction/mahalo/pom.xml
incubator/river/jtsk/skunk/niclas1/services/transaction/mahalo/src/main/java/com/sun/jini/mahalo/TxnManagerTransaction.java
incubator/river/jtsk/skunk/niclas1/tools/phoenix/pom.xml
incubator/river/jtsk/skunk/niclas1/tools/pom.xml
incubator/river/jtsk/skunk/niclas1/tools/start/pom.xml
Modified: incubator/river/jtsk/skunk/niclas1/bed/action/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/action/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/action/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/action/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,18 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-impl</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-action</artifactId>
- <name>Apache River - Shared - Action</name>
+ <name>Apache River - Bed - Action</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-logging</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/activation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/activation/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/activation/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/activation/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,33 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-core</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-activation</artifactId>
- <name>Apache River - API - Activation</name>
+ <name>Apache River - Bed - Activation</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
+ <groupId>org.apache.river.bed</groupId>
+ <artifactId>river-constraints</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
- <artifactId>river-constraint</artifactId>
- <version>10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-export</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-action</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/collection/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/collection/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/collection/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/collection/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,22 +4,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-impl</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-collection</artifactId>
- <name>Apache River - Shared - Collections</name>
+ <name>Apache River - Bed - Collections</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-action</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-constants</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/config/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/config/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/config/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/config/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,38 +4,33 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-api</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-config</artifactId>
- <name>Apache River - API - Config</name>
+ <name>Apache River - Bed - Config</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
- <version>10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-id</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-loader</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-security</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-io</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/constants/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/constants/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/constants/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/constants/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-impl</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-constants</artifactId>
- <name>Apache River - Shared - Action</name>
+ <name>Apache River - Bed - Action</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
</project>
Modified: incubator/river/jtsk/skunk/niclas1/bed/constraints/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/constraints/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/constraints/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/constraints/pom.xml Mon Dec 22 02:32:10 2008
@@ -1,16 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.river.poms</groupId>
- <artifactId>master</artifactId>
- <version>10.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
- <name>Apache River - Core API</name>
- <packaging>jar</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.river.poms</groupId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.river.bed</groupId>
+ <artifactId>river-constraints</artifactId>
+ <name>Apache River - Bed - Constraints</name>
+ <packaging>jar</packaging>
+ <version>10.0-SNAPSHOT</version>
</project>
Modified: incubator/river/jtsk/skunk/niclas1/bed/export/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/export/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/export/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/export/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,43 +4,38 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-core</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-export</artifactId>
- <name>Apache River - API - export</name>
+ <name>Apache River - Bed - export</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
- <version>10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-security</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-loader</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-io</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-collection</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-thread</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/id/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/id/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/id/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/id/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,33 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-api</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-id</artifactId>
- <name>Apache River - API - ID</name>
+ <name>Apache River - Bed - ID</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
- <version>10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-security</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-loader</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-io</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/io/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/io/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/io/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/io/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,28 +4,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-api</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-io</artifactId>
- <name>Apache River - API - I/O</name>
+ <name>Apache River - Bed - I/O</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
- <version>10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-loader</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-security</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/loader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/loader/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/loader/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/loader/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,33 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-api</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-loader</artifactId>
- <name>Apache River - API - Loader</name>
+ <name>Apache River - Bed - Loader</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
- <version>10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-action</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-logging</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-security</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/logging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/logging/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/logging/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/logging/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-impl</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-logging</artifactId>
- <name>Apache River - Shared - Logging</name>
+ <name>Apache River - Bed - Logging</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
Added: incubator/river/jtsk/skunk/niclas1/bed/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/pom.xml?rev=728638&view=auto
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/pom.xml (added)
+++ incubator/river/jtsk/skunk/niclas1/bed/pom.xml Mon Dec 22 02:32:10 2008
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.river.build</groupId>
+ <artifactId>build-bed</artifactId>
+ <name>Build - Bed</name>
+ <packaging>pom</packaging>
+ <version>10.0-SNAPSHOT</version>
+ <!-- This POM is ONLY to initiate the modules to be built. -->
+
+ <modules>
+ <module>action</module>
+ <module>activation</module>
+ <module>collection</module>
+ <module>config</module>
+ <module>constants</module>
+ <module>constraints</module>
+ <module>export</module>
+ <module>id</module>
+ <module>io</module>
+ <module>loader</module>
+ <module>logging</module>
+ <module>proxy</module>
+ <module>security</module>
+ <module>service</module>
+ <module>system</module>
+ <module>thread</module>
+ <module>url</module>
+ </modules>
+
+</project>
Modified: incubator/river/jtsk/skunk/niclas1/bed/proxy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/proxy/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/proxy/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/proxy/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,33 +4,28 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-impl</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-proxy</artifactId>
- <name>Apache River - Shared - Proxy</name>
+ <name>Apache River - Bed - Proxy</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
+ <groupId>org.apache.river.bed</groupId>
+ <artifactId>river-constraints</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
- <artifactId>river-constraint</artifactId>
- <version>10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-export</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-logging</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/security/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/security/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/security/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,28 +4,33 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-core</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-security</artifactId>
- <name>Apache River - API - Security</name>
+ <name>Apache River - Bed - Security</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
+ <groupId>org.apache.river.bed</groupId>
+ <artifactId>river-constraints</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
+ <artifactId>river-collection</artifactId>
+ <version>10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-logging</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-service</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Added: incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/BasicMethodConstraints.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/BasicMethodConstraints.java?rev=728638&view=auto
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/BasicMethodConstraints.java (added)
+++ incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/BasicMethodConstraints.java Mon Dec 22 02:32:10 2008
@@ -0,0 +1,771 @@
+/*
+ * 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.
+ */
+
+package net.jini.constraint;
+
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamField;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import net.jini.core.constraint.InvocationConstraints;
+import net.jini.core.constraint.MethodConstraints;
+
+/**
+ * Basic implementation of {@link MethodConstraints}, allowing limited
+ * wildcard matching on method names and parameter types. Methods can be
+ * specified by exact name and parameter types (matching a single method),
+ * by exact name (matching all methods with that name), by name prefix
+ * (matching all methods with names that start with that prefix), by name
+ * suffix (matching all methods with names that end with that suffix), and
+ * by a default that matches all methods. Normally instances of this class
+ * should be obtained from a
+ * {@link net.jini.config.Configuration} rather than being
+ * explicitly constructed.
+ *
+ * @author Sun Microsystems, Inc.
+ * @since 2.0
+ */
+public final class BasicMethodConstraints
+ implements MethodConstraints, Serializable
+{
+ private static final long serialVersionUID = 1432234194703790047L;
+
+ /**
+ * @serialField descs MethodDesc[] The ordered method descriptors.
+ */
+ private static final ObjectStreamField[] serialPersistentFields = {
+ new ObjectStreamField( "descs", MethodDesc[].class, true )
+ };
+
+ /**
+ * The ordered method descriptors.
+ */
+ private final MethodDesc[] descs;
+
+ /**
+ * Descriptor for specifying the constraints associated with one or
+ * more methods allowing limited wildcard matching on method names and
+ * parameter types. Methods can be specified by exact name and parameter
+ * types (matching a single method), by exact name (matching all methods
+ * with that name), by name prefix (matching all methods with names that
+ * start with that prefix), by name suffix (matching all methods with
+ * names that end with that suffix), and by a default that matches all
+ * methods.
+ *
+ * @since 2.0
+ */
+ public static final class MethodDesc implements Serializable
+ {
+ private static final long serialVersionUID = 6773269226844208999L;
+
+ /**
+ * @serialField name String
+ * The name of the method, with prefix or suffix '*' permitted
+ * if <code>types</code> is <code>null</code>, or <code>null</code>
+ * for a descriptor that matches all methods (in which case
+ * <code>types</code> must also be <code>null</code>).
+ * @serialField types Class[]
+ * The parameter types for the specified method, or <code>null</code>
+ * for wildcard parameter types.
+ * @serialField constraints InvocationConstraints
+ * The non-empty constraints for the specified method or methods, or
+ * <code>null</code> if there are no constraints.
+ */
+ private static final ObjectStreamField[] serialPersistentFields = {
+ new ObjectStreamField( "name", String.class ),
+ new ObjectStreamField( "types", Class[].class, true ),
+ new ObjectStreamField( "constraints", InvocationConstraints.class )
+ };
+
+ /**
+ * The name of the method, with prefix or suffix '*' permitted
+ * if <code>types</code> is <code>null</code>, or <code>null</code>
+ * for a descriptor that matches all methods (in which case
+ * <code>types</code> must also be <code>null</code>.
+ */
+ final String name;
+ /**
+ * The formal parameter types of the method, in declared order,
+ * or <code>null</code> for wildcard parameter types.
+ */
+ final Class[] types;
+ /**
+ * The non-empty constraints for the specified method or methods, or
+ * <code>null</code> if there are no constraints.
+ */
+ final InvocationConstraints constraints;
+
+ /**
+ * Creates a descriptor that only matches methods with exactly the
+ * specified name and parameter types. The constraints can be
+ * <code>null</code>, which is treated the same as an empty
+ * instance. The array passed to the constructor is neither modified
+ * nor retained; subsequent changes to that array have no effect on
+ * the instance created.
+ *
+ * @param name the name of the method
+ * @param types the formal parameter types of the method, in declared
+ * order
+ * @param constraints the constraints, or <code>null</code>
+ * @throws NullPointerException if <code>name</code> or
+ * <code>types</code> is <code>null</code> or any element of
+ * <code>types</code> is <code>null</code>
+ * @throws IllegalArgumentException if <code>name</code> is not a
+ * syntactically valid method name
+ */
+ public MethodDesc( String name,
+ Class[] types,
+ InvocationConstraints constraints )
+ {
+ this.name = name;
+ this.types = (Class[]) types.clone();
+ if( constraints != null && constraints.isEmpty() )
+ {
+ constraints = null;
+ }
+ this.constraints = constraints;
+ check();
+ }
+
+ /**
+ * Creates a descriptor that matches all methods with names that
+ * equal the specified name or that match the specified pattern,
+ * regardless of their parameter types. If the specified name starts
+ * with the character '*', then this descriptor matches all methods
+ * with names that end with the rest of the specified name. If the
+ * specified name ends with the character '*', then this descriptor
+ * matches all methods with names that start with the rest of the
+ * specified name. Otherwise, this descriptor matches all methods
+ * with names that equal the specified name. The constraints can be
+ * <code>null</code>, which is treated the same as an empty instance.
+ *
+ * @param name the name of the method, with a prefix or suffix '*'
+ * permitted for pattern matching
+ * @param constraints the constraints, or <code>null</code>
+ * @throws NullPointerException if <code>name</code> is
+ * <code>null</code>
+ * @throws IllegalArgumentException if <code>name</code> does not
+ * match any syntactically valid method name
+ */
+ public MethodDesc( String name, InvocationConstraints constraints )
+ {
+ this.name = name;
+ this.types = null;
+ if( constraints != null && constraints.isEmpty() )
+ {
+ constraints = null;
+ }
+ this.constraints = constraints;
+ check();
+ }
+
+ /**
+ * Verifies that the name is a syntactically valid method name, or
+ * (if types is null) if the name is a syntactically valid method name
+ * with a '*' appended or could be constructed from some syntactically
+ * valid method name containing more than two characters by replacing
+ * the first character of that name with '*', and verifies that none
+ * of the elements of types are null.
+ */
+ private void check()
+ {
+ boolean star = types == null;
+ int len = name.length();
+ if( len == 0 )
+ {
+ throw new IllegalArgumentException(
+ "method name cannot be empty" );
+ }
+ char c = name.charAt( 0 );
+ if( !Character.isJavaIdentifierStart( c ) &&
+ !( star && c == '*' && len > 1 ) )
+ {
+ throw new IllegalArgumentException( "invalid method name" );
+ }
+ if( star && c != '*' && name.charAt( len - 1 ) == '*' )
+ {
+ len--;
+ }
+ while( --len >= 1 )
+ {
+ if( !Character.isJavaIdentifierPart( name.charAt( len ) ) )
+ {
+ throw new IllegalArgumentException( "invalid method name" );
+ }
+ }
+ if( types != null )
+ {
+ for( int i = types.length; --i >= 0; )
+ {
+ if( types[ i ] == null )
+ {
+ throw new NullPointerException( "class cannot be null" );
+ }
+ }
+ }
+ }
+
+ /**
+ * Creates a default descriptor that matches all methods. The
+ * constraints can be <code>null</code>, which is treated the same as
+ * an empty instance.
+ *
+ * @param constraints the constraints, or <code>null</code>
+ */
+ public MethodDesc( InvocationConstraints constraints )
+ {
+ this.name = null;
+ this.types = null;
+ if( constraints != null && constraints.isEmpty() )
+ {
+ constraints = null;
+ }
+ this.constraints = constraints;
+ }
+
+ /**
+ * Returns the name of the method, with a prefix or suffix '*' if the
+ * name is a pattern, or <code>null</code> if this descriptor matches
+ * all methods.
+ *
+ * @return the name of the method, with a prefix or suffix '*' if the
+ * name is a pattern, or <code>null</code> if this descriptor matches
+ * all methods
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Returns the parameter types, or <code>null</code> if this
+ * descriptor matches all parameter types or all methods. Returns a
+ * new non-<code>null</code> array every time it is called.
+ *
+ * @return the parameter types, or <code>null</code> if this
+ * descriptor matches all parameter types or all methods
+ */
+ public Class[] getParameterTypes()
+ {
+ return types == null ? null : (Class[]) types.clone();
+ }
+
+ /**
+ * Returns the constraints as a non-<code>null</code> value.
+ *
+ * @return the constraints as a non-<code>null</code> value
+ */
+ public InvocationConstraints getConstraints()
+ {
+ return ( constraints == null ?
+ InvocationConstraints.EMPTY : constraints );
+ }
+
+ /**
+ * Returns a hash code value for this object.
+ */
+ public int hashCode()
+ {
+ int h = 0;
+ if( name != null )
+ {
+ h += name.hashCode();
+ }
+ if( types != null )
+ {
+ h += hash( types );
+ }
+ if( constraints != null )
+ {
+ h += constraints.hashCode();
+ }
+ return h;
+ }
+
+ /**
+ * Two instances of this class are equal if they have the same
+ * name, the same parameter types, and the same constraints.
+ */
+ public boolean equals( Object obj )
+ {
+ if( this == obj )
+ {
+ return true;
+ }
+ else if( !( obj instanceof MethodDesc ) )
+ {
+ return false;
+ }
+ MethodDesc od = (MethodDesc) obj;
+ return ( ( name == null ?
+ od.name == null : name.equals( od.name ) ) &&
+ Arrays.equals( types, od.types ) &&
+ ( constraints == null ?
+ od.constraints == null :
+ constraints.equals( od.constraints ) ) );
+ }
+
+ /**
+ * Returns a string representation of this object.
+ */
+ public String toString()
+ {
+ StringBuffer buf = new StringBuffer( "MethodDesc[" );
+ toString( buf, true );
+ buf.append( ']' );
+ return buf.toString();
+ }
+
+ /**
+ * Appends a string representation of this object to the buffer.
+ */
+ void toString( StringBuffer buf, boolean includeConstraints )
+ {
+ buf.append( name == null ? "default" : name );
+ if( types != null )
+ {
+ buf.append( '(' );
+ for( int i = 0; i < types.length; i++ )
+ {
+ if( i > 0 )
+ {
+ buf.append( ", " );
+ }
+ buf.append( types[ i ].getName() );
+ }
+ buf.append( ')' );
+ }
+ if( includeConstraints )
+ {
+ buf.append( " => " ).append( constraints );
+ }
+ }
+
+ /**
+ * Verifies that the method name, parameter types, and constraints are
+ * valid.
+ *
+ * @throws InvalidObjectException if <code>types</code> is
+ * non-<code>null</code> and <code>name</code> is either
+ * <code>null</code> or is not a syntactically valid method name;
+ * or if <code>types</code> is <code>null</code> and <code>name</code>
+ * is neither a syntactically valid method name, a syntactically
+ * valid method name with a '*' appended, nor a name constructed from
+ * some syntactically valid method name containing more than two
+ * characters by replacing the first character of that name with '*';
+ * or if any element of <code>types</code> is <code>null</code>; or
+ * if <code>constraints</code> is non-<code>null</code> but empty
+ */
+ private void readObject( ObjectInputStream s )
+ throws IOException, ClassNotFoundException
+ {
+ s.defaultReadObject();
+ if( name == null )
+ {
+ if( types != null )
+ {
+ throw new InvalidObjectException(
+ "cannot have types with null name" );
+ }
+ }
+ else
+ {
+ try
+ {
+ check();
+ }
+ catch( RuntimeException e )
+ {
+ rethrow( e );
+ }
+ }
+ if( constraints != null && constraints.isEmpty() )
+ {
+ throw new InvalidObjectException(
+ "constraints cannot be empty" );
+ }
+ }
+ }
+
+ /**
+ * Creates an instance with the specified ordered array of descriptors.
+ * The {@link #getConstraints getConstraints} method searches the
+ * descriptors in the specified order. For any given descriptor in the
+ * array, no preceding descriptor can match at least the same methods as
+ * the given descriptor; that is, more specific descriptors must precede
+ * less specific descriptors. The array passed to the constructor is
+ * neither modified nor retained; subsequent changes to that array have
+ * no effect on the instance created.
+ *
+ * @param descs the descriptors
+ * @throws NullPointerException if the argument is <code>null</code> or
+ * any element of the argument is <code>null</code>
+ * @throws IllegalArgumentException if the descriptors array is empty, or
+ * if any descriptor is preceded by another descriptor that matches at
+ * least the same methods
+ */
+ public BasicMethodConstraints( MethodDesc[] descs )
+ {
+ this.descs = (MethodDesc[]) descs.clone();
+ check();
+ }
+
+ /**
+ * Throws IllegalArgumentException if the descriptors array is empty, or
+ * if any descriptor is preceded by another descriptor that matches at
+ * least the same methods. Throws NullPointerException if the array or
+ * any element is null.
+ */
+ private void check()
+ {
+ if( descs.length == 0 )
+ {
+ throw new IllegalArgumentException(
+ "must have at least one descriptor" );
+ }
+ for( int i = 0; i < descs.length; i++ )
+ {
+ MethodDesc desc = descs[ i ];
+ String dname = desc.name;
+ if( dname == null )
+ {
+ if( i < descs.length - 1 )
+ {
+ throw new IllegalArgumentException(
+ "default descriptor must be last" );
+ }
+ }
+ else if( dname.charAt( 0 ) == '*' )
+ {
+ int dlen = dname.length() + 1;
+ for( int j = 0; j < i; j++ )
+ {
+ MethodDesc prev = descs[ j ];
+ String pname = prev.name;
+ if( pname.charAt( 0 ) == '*' &&
+ pname.regionMatches( 1, dname, dlen - pname.length(),
+ pname.length() - 1 ) )
+ {
+ check( prev, desc );
+ }
+ }
+ }
+ else if( dname.charAt( dname.length() - 1 ) == '*' )
+ {
+ for( int j = 0; j < i; j++ )
+ {
+ MethodDesc prev = descs[ j ];
+ String pname = prev.name;
+ int plen = pname.length() - 1;
+ if( pname.charAt( plen ) == '*' &&
+ pname.regionMatches( 0, dname, 0, plen ) )
+ {
+ check( prev, desc );
+ }
+ }
+ }
+ else
+ {
+ for( int j = 0; j < i; j++ )
+ {
+ MethodDesc prev = descs[ j ];
+ String pname = prev.name;
+ int plen = pname.length() - 1;
+ if( pname.charAt( 0 ) == '*' )
+ {
+ if( dname.regionMatches( dname.length() - plen,
+ pname, 1, plen ) )
+ {
+ check( prev, desc );
+ }
+ }
+ else if( pname.charAt( plen ) == '*' )
+ {
+ if( dname.regionMatches( 0, pname, 0, plen ) )
+ {
+ check( prev, desc );
+ }
+ }
+ else
+ {
+ if( pname.equals( dname ) )
+ {
+ check( prev, desc );
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Throws IllegalArgumentException if the parameter types of prev cover
+ * those of desc.
+ */
+ private static void check( MethodDesc prev, MethodDesc desc )
+ {
+ if( prev.types == null || Arrays.equals( prev.types, desc.types ) )
+ {
+ StringBuffer buf = new StringBuffer();
+ prev.toString( buf, false );
+ buf.append( " cannot precede " );
+ desc.toString( buf, false );
+ throw new IllegalArgumentException( buf.toString() );
+ }
+ }
+
+ /**
+ * Creates an instance that maps all methods to the specified constraints.
+ * The constraints can be <code>null</code>, which is treated the same as
+ * an empty instance. Calling this constructor is equivalent to
+ * constructing an instance of this class with an array containing a
+ * single default descriptor constructed with the specified constraints.
+ *
+ * @param constraints the constraints, or <code>null</code>
+ */
+ public BasicMethodConstraints( InvocationConstraints constraints )
+ {
+ descs = new MethodDesc[]{ new MethodDesc( constraints ) };
+ }
+
+ /**
+ * Returns the constraints for the specified remote method as a
+ * non-<code>null</code> value. Searches the descriptors in order, and
+ * returns the constraints in the first descriptor that matches the
+ * method, or an empty constraints instance if there is no match.
+ *
+ * @throws NullPointerException {@inheritDoc}
+ */
+ public InvocationConstraints getConstraints( Method method )
+ {
+ String name = method.getName();
+ Class[] types = null;
+ InvocationConstraints sc = null;
+ outer:
+ for( int i = 0; i < descs.length; i++ )
+ {
+ MethodDesc desc = descs[ i ];
+ String dname = desc.name;
+ if( dname == null )
+ {
+ sc = desc.constraints;
+ break;
+ }
+ else if( desc.types != null )
+ {
+ if( !name.equals( dname ) )
+ {
+ continue;
+ }
+ if( types == null )
+ {
+ types = method.getParameterTypes();
+ }
+ if( types.length != desc.types.length )
+ {
+ continue;
+ }
+ for( int j = types.length; --j >= 0; )
+ {
+ if( types[ j ] != desc.types[ j ] )
+ {
+ continue outer;
+ }
+ }
+ sc = desc.constraints;
+ break;
+ }
+ else
+ {
+ int dlen = dname.length() - 1;
+ if( dname.charAt( 0 ) == '*' )
+ {
+ if( name.regionMatches( name.length() - dlen,
+ dname, 1, dlen ) )
+ {
+ sc = desc.constraints;
+ break;
+ }
+ }
+ else if( dname.charAt( dlen ) == '*' )
+ {
+ if( name.regionMatches( 0, dname, 0, dlen ) )
+ {
+ sc = desc.constraints;
+ break;
+ }
+ }
+ else if( name.equals( dname ) )
+ {
+ sc = desc.constraints;
+ break;
+ }
+ }
+ }
+ if( sc == null )
+ {
+ sc = InvocationConstraints.EMPTY;
+ }
+ return sc;
+ }
+
+ /* inherit javadoc */
+ public Iterator possibleConstraints()
+ {
+ return new Iterator()
+ {
+ private int i = descs.length;
+ private boolean empty = descs[ i - 1 ].name != null;
+
+ public boolean hasNext()
+ {
+ return i > 0 || empty;
+ }
+
+ public Object next()
+ {
+ if( i == 0 )
+ {
+ if( empty )
+ {
+ empty = false;
+ return InvocationConstraints.EMPTY;
+ }
+ throw new NoSuchElementException( "no more elements" );
+ }
+ InvocationConstraints sc = descs[ --i ].constraints;
+ if( sc == null )
+ {
+ sc = InvocationConstraints.EMPTY;
+ }
+ return sc;
+ }
+
+ public void remove()
+ {
+ throw new UnsupportedOperationException( "immutable object" );
+ }
+ };
+ }
+
+ /**
+ * Returns the descriptors. Returns a new non-<code>null</code> array
+ * every time it is called.
+ *
+ * @return the descriptors as a new non-<code>null</code> array
+ */
+ public MethodDesc[] getMethodDescs()
+ {
+ return (MethodDesc[]) descs.clone();
+ }
+
+ /**
+ * Returns a hash code value for this object.
+ */
+ public int hashCode()
+ {
+ return hash( descs );
+ }
+
+ /**
+ * Returns a string representation of this object.
+ */
+ public String toString()
+ {
+ StringBuffer buf = new StringBuffer( "BasicMethodConstraints{" );
+ for( int i = 0; i < descs.length; i++ )
+ {
+ if( i > 0 )
+ {
+ buf.append( ", " );
+ }
+ descs[ i ].toString( buf, true );
+ }
+ buf.append( '}' );
+ return buf.toString();
+ }
+
+ /**
+ * Two instances of this class are equal if they have the same descriptors
+ * in the same order.
+ */
+ public boolean equals( Object obj )
+ {
+ return ( this == obj ||
+ ( obj instanceof BasicMethodConstraints &&
+ Arrays.equals( descs, ( (BasicMethodConstraints) obj ).descs ) ) );
+ }
+
+ /**
+ * Verifies legal descriptor ordering.
+ *
+ * @throws InvalidObjectException if any descriptor is <code>null</code>,
+ * or the descriptors array is empty, or if any descriptor is preceded by
+ * another descriptor that matches at least the same methods
+ */
+ private void readObject( ObjectInputStream s )
+ throws IOException, ClassNotFoundException
+ {
+ s.defaultReadObject();
+ try
+ {
+ check();
+ }
+ catch( RuntimeException e )
+ {
+ rethrow( e );
+ }
+ }
+
+ /**
+ * Returns the sum of the hash codes of all elements of the given array.
+ */
+ private static int hash( Object[] elements )
+ {
+ int h = 0;
+ for( int i = elements.length; --i >= 0; )
+ {
+ h += elements[ i ].hashCode();
+ }
+ return h;
+ }
+
+ /**
+ * If the exception is a NullPointerException or IllegalArgumentException,
+ * wrap it in an InvalidObjectException and throw that, otherwise rethrow
+ * the exception as is.
+ */
+ private static void rethrow( RuntimeException e )
+ throws InvalidObjectException
+ {
+ if( e instanceof NullPointerException ||
+ e instanceof IllegalArgumentException )
+ {
+ InvalidObjectException ee =
+ new InvalidObjectException( e.getMessage() );
+ ee.initCause( e );
+ throw ee;
+ }
+ throw e;
+ }
+}
Added: incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/ConstraintTrustVerifier.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/ConstraintTrustVerifier.java?rev=728638&view=auto
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/ConstraintTrustVerifier.java (added)
+++ incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/ConstraintTrustVerifier.java Mon Dec 22 02:32:10 2008
@@ -0,0 +1,200 @@
+/*
+ * 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.
+ */
+
+package net.jini.constraint;
+
+import java.rmi.RemoteException;
+import java.security.Principal;
+import java.util.Iterator;
+import java.util.Set;
+import javax.security.auth.kerberos.KerberosPrincipal;
+import javax.security.auth.x500.X500Principal;
+import net.jini.core.constraint.ClientAuthentication;
+import net.jini.core.constraint.ClientMaxPrincipal;
+import net.jini.core.constraint.ClientMaxPrincipalType;
+import net.jini.core.constraint.ClientMinPrincipal;
+import net.jini.core.constraint.ClientMinPrincipalType;
+import net.jini.core.constraint.Confidentiality;
+import net.jini.core.constraint.ConstraintAlternatives;
+import net.jini.core.constraint.Delegation;
+import net.jini.core.constraint.DelegationAbsoluteTime;
+import net.jini.core.constraint.DelegationRelativeTime;
+import net.jini.core.constraint.Integrity;
+import net.jini.core.constraint.InvocationConstraint;
+import net.jini.core.constraint.InvocationConstraints;
+import net.jini.core.constraint.ServerAuthentication;
+import net.jini.core.constraint.ServerMinPrincipal;
+import net.jini.security.TrustVerifier;
+
+/**
+ * Trust verifier for instances of the constraint classes defined in the
+ * {@link net.jini.core.constraint} package, and for the
+ * {@link BasicMethodConstraints}, {@link X500Principal} and
+ * {@link KerberosPrincipal} classes. This class is intended to be specified
+ * in a resource to configure the operation of
+ * {@link net.jini.security.Security#verifyObjectTrust
+ * Security.verifyObjectTrust}.
+ *
+ * @author Sun Microsystems, Inc.
+ * @since 2.0
+ */
+public class ConstraintTrustVerifier implements TrustVerifier
+{
+
+ /**
+ * Creates an instance.
+ */
+ public ConstraintTrustVerifier()
+ {
+ }
+
+ /**
+ * Returns <code>true</code> if the specified object is known to be
+ * trusted to correctly implement its contract; returns <code>false</code>
+ * otherwise. Returns <code>true</code> if any of the following conditions
+ * holds, and returns <code>false</code> otherwise:
+ * <ul>
+ * <li>The object is an instance of any of the following classes:
+ * <ul>
+ * <li>{@link ClientAuthentication}
+ * <li>{@link ClientMaxPrincipalType}
+ * <li>{@link ClientMinPrincipalType}
+ * <li>{@link Confidentiality}
+ * <li>{@link DelegationAbsoluteTime}
+ * <li>{@link DelegationRelativeTime}
+ * <li>{@link Delegation}
+ * <li>{@link Integrity}
+ * <li>{@link ServerAuthentication}
+ * </ul>
+ * <li>The object is an instance of any of the following classes:
+ * <ul>
+ * <li>{@link ClientMinPrincipal}
+ * <li>{@link ClientMaxPrincipal}
+ * <li>{@link ServerMinPrincipal}
+ * </ul>
+ * and all of the principals in that object are trusted (determined by
+ * calling the <code>isTrustedObject</code> method on the specified context
+ * with each principal)
+ * <li>The object is an instance of {@link ConstraintAlternatives} and all
+ * of the constraint alternatives in that object are trusted (determined
+ * by calling the <code>isTrustedObject</code> method on the specified
+ * context with each constraint alternative)
+ * <li>The object is an instance of {@link BasicMethodConstraints} and all
+ * the {@link InvocationConstraints} instances in that object are trusted
+ * (determined by calling the <code>isTrustedObject</code> method on the
+ * specified context with each instance)
+ * <li>The object is an instance of <code>InvocationConstraints</code> and
+ * all of the constraints (both requirements and preferences) in that
+ * object are trusted (determined by calling the
+ * <code>isTrustedObject</code> method on the specified context with each
+ * constraint)
+ * <li>The object is an instance of {@link X500Principal} or
+ * {@link KerberosPrincipal}
+ * </ul>
+ *
+ * @throws NullPointerException {@inheritDoc}
+ */
+ public boolean isTrustedObject( Object obj, TrustVerifier.Context ctx )
+ throws RemoteException
+ {
+ if( obj == null || ctx == null )
+ {
+ throw new NullPointerException();
+ }
+ else if( obj instanceof InvocationConstraint )
+ {
+ Class c = obj.getClass();
+ if( c == ServerAuthentication.class ||
+ c == ClientAuthentication.class ||
+ c == Confidentiality.class ||
+ c == Integrity.class ||
+ c == ClientMinPrincipalType.class ||
+ c == ClientMaxPrincipalType.class ||
+ c == Delegation.class ||
+ c == DelegationRelativeTime.class ||
+ c == DelegationAbsoluteTime.class )
+ {
+ return true;
+ }
+ else if( c == ServerMinPrincipal.class )
+ {
+ return trusted( ( (ServerMinPrincipal) obj ).elements(), ctx );
+ }
+ else if( c == ClientMinPrincipal.class )
+ {
+ return trusted( ( (ClientMinPrincipal) obj ).elements(), ctx );
+ }
+ else if( c == ClientMaxPrincipal.class )
+ {
+ return trusted( ( (ClientMaxPrincipal) obj ).elements(), ctx );
+ }
+ else if( c == ConstraintAlternatives.class )
+ {
+ return trusted( ( (ConstraintAlternatives) obj ).elements(), ctx );
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else if( obj instanceof BasicMethodConstraints )
+ {
+ return trusted(
+ ( (BasicMethodConstraints) obj ).possibleConstraints(),
+ ctx );
+ }
+ else if( obj instanceof InvocationConstraints )
+ {
+ InvocationConstraints ic = (InvocationConstraints) obj;
+ return ( trusted( ic.requirements(), ctx ) &&
+ trusted( ic.preferences(), ctx ) );
+ }
+ else if( obj instanceof Principal )
+ {
+ Class c = obj.getClass();
+ return c == X500Principal.class || c == KerberosPrincipal.class;
+ }
+ return false;
+ }
+
+
+ /**
+ * Returns true if all elements of the set are trusted instances.
+ */
+ private static boolean trusted( Set set, TrustVerifier.Context ctx )
+ throws RemoteException
+ {
+ return trusted( set.iterator(), ctx );
+ }
+
+ /**
+ * Returns true if all elements of the iterator are trusted instances.
+ */
+ private static boolean trusted( Iterator iter, TrustVerifier.Context ctx )
+ throws RemoteException
+ {
+ while( iter.hasNext() )
+ {
+ if( !ctx.isTrustedObject( iter.next() ) )
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+}
Added: incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/package.html?rev=728638&view=auto
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/package.html (added)
+++ incubator/river/jtsk/skunk/niclas1/bed/security/src/main/java/net/jini/constraint/package.html Mon Dec 22 02:32:10 2008
@@ -0,0 +1,44 @@
+<!--
+ ! 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 HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+
+
+</head>
+<body bgcolor="white">
+
+Provides a basic implementation of
+{@link net.jini.core.constraint.MethodConstraints} and a
+{@link net.jini.security.TrustVerifier} for common constraints.
+{@link net.jini.constraint.BasicMethodConstraints} is a basic implementation
+of <code>MethodConstraints</code>, allowing limited wildcard matching on
+method names and parameter types.
+{@link net.jini.constraint.ConstraintTrustVerifier} is a trust verifier for
+instances of the constraint classes defined in the
+{@link net.jini.core.constraint} package, and for the
+<code>BasicMethodConstraints</code>,
+{@link javax.security.auth.x500.X500Principal} and
+{@link javax.security.auth.kerberos.KerberosPrincipal} classes.
+
+@since 2.0
+@version 2.0
+
+</body>
+</html>
Modified: incubator/river/jtsk/skunk/niclas1/bed/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/service/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/service/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/service/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-impl</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-service</artifactId>
- <name>Apache River - Shared - Service</name>
+ <name>Apache River - Bed - Service</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
Modified: incubator/river/jtsk/skunk/niclas1/bed/system/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/system/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/system/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/system/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-impl</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-system</artifactId>
- <name>Apache River - Shared - System</name>
+ <name>Apache River - Bed - System</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
Modified: incubator/river/jtsk/skunk/niclas1/bed/thread/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/thread/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/thread/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/thread/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,22 +4,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-impl</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-thread</artifactId>
- <name>Apache River - Shared - Thread Management</name>
+ <name>Apache River - Bed - Thread Management</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-action</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-constants</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Modified: incubator/river/jtsk/skunk/niclas1/bed/url/pom.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/niclas1/bed/url/pom.xml?rev=728638&r1=728573&r2=728638&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/niclas1/bed/url/pom.xml (original)
+++ incubator/river/jtsk/skunk/niclas1/bed/url/pom.xml Mon Dec 22 02:32:10 2008
@@ -4,28 +4,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.river.poms</groupId>
- <artifactId>master-service-api</artifactId>
+ <artifactId>master-bed</artifactId>
<version>10.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-url</artifactId>
- <name>Apache River - API - URL</name>
+ <name>Apache River - Bed - URL</name>
<packaging>jar</packaging>
<version>10.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.river.core</groupId>
- <artifactId>river-core-api</artifactId>
- <version>10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.river.shared</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-logging</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.river.api</groupId>
+ <groupId>org.apache.river.bed</groupId>
<artifactId>river-security</artifactId>
<version>10.0-SNAPSHOT</version>
</dependency>
Propchange: incubator/river/jtsk/skunk/niclas1/core/discoveryjoin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 22 02:32:10 2008
@@ -0,0 +1 @@
+target