You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/05/27 20:52:39 UTC

svn commit: r1486693 - in /juddi/trunk: juddi-core/src/main/java/org/apache/juddi/security/ juddi-examples/uddi-createbulk/nbproject/ uddi-tck/src/test/java/org/apache/juddi/v3/tck/

Author: alexoree
Date: Mon May 27 18:52:38 2013
New Revision: 1486693

URL: http://svn.apache.org/r1486693
Log:
Removing some extraneous debugging statements for one of the jira test cases
Adding the basic framework for a pluggable authorization system for juddi. It's not integrated, but I hope that it can be used as a framework in the near future

Added:
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlException.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlFactory.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessLevel.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AllowAllAccessControlImpl.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/DefaultCorseAccessControlImpl.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/IAccessControl.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/RoleBasedAccessControlImpl.java
Modified:
    juddi/trunk/juddi-examples/uddi-createbulk/nbproject/project.properties
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java

Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlException.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlException.java?rev=1486693&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlException.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlException.java Mon May 27 18:52:38 2013
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.juddi.security;
+
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.RegistryException;
+import org.apache.juddi.v3.error.UDDIErrorHelper;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class AccessControlException extends RegistryException {
+
+    private static final long serialVersionUID = -3459892224164959205L;
+
+    public AccessControlException(ErrorMessage message) {
+        super(message, UDDIErrorHelper.buildDispositionReport(UDDIErrorHelper.E_REQUEST_DENIED));
+    }
+}

Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlFactory.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlFactory.java?rev=1486693&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlFactory.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessControlFactory.java Mon May 27 18:52:38 2013
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.juddi.security;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.Property;
+
+/**
+ * Provides an accessor to the access control mechanism
+ *
+ * @author Alex O'Ree
+ */
+public class AccessControlFactory {
+
+    static final Logger log = Logger.getLogger(AccessControlFactory.class.getName());
+    private static IAccessControl instance = null;
+
+    /**
+     * Gets an instance of IAccessControl using the following procedure, in order<br>
+     * <ol>
+     * <li>Using the judiv3.properties configuration file setting Property.JUDDI_FINE_GRAIN_ACCESS_CONTROL_PROVIDER</li>
+     * <li>If the previous fails to load or is not defined, DefaultCorseAccessControlImpl</li>
+     * </ol>
+     * @return should never return null or throw exceptions
+     * @see DefaultCorseAccessControlImpl
+     * @see Property
+     */
+    public static IAccessControl getAccessControlInstance() {
+        if (instance != null) {
+            return instance;
+        }
+        String clazz = null;
+        try {
+            clazz = AppConfig.getConfiguration().getString(Property.JUDDI_ACCESS_CONTROL_PROVIDER, DefaultCorseAccessControlImpl.class.getCanonicalName());
+            Class c = Class.forName(clazz);
+            IAccessControl ret = (IAccessControl) c.newInstance();
+            log.log(Level.INFO, "Successfully loaded FineGrainedAccessControl provider {0}", clazz);
+            instance = ret;
+            return ret;
+        } catch (IllegalAccessException x) {
+            log.log(Level.WARNING, "error loading control provider " + clazz, x);
+        } catch (InstantiationException x) {
+            log.log(Level.WARNING, "error loading control provider " + clazz, x);
+        } catch (ExceptionInInitializerError x) {
+            log.log(Level.WARNING, "error loading control provider " + clazz, x);
+        } catch (SecurityException x) {
+            log.log(Level.WARNING, "error loading control provider " + clazz, x);
+        } catch (ClassNotFoundException x) {
+            log.log(Level.WARNING, "error loading control provider " + clazz, x);
+        } catch (ConfigurationException x) {
+            log.log(Level.WARNING, "error loading control provider " + clazz, x);
+        } catch (Exception x) {
+            log.log(Level.WARNING, "error loading control provider " + clazz, x);
+        }
+        return new DefaultCorseAccessControlImpl();
+    }
+}

Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessLevel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessLevel.java?rev=1486693&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessLevel.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AccessLevel.java Mon May 27 18:52:38 2013
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.juddi.security;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public enum AccessLevel {
+    /**
+     * No access at all
+     */
+    NONE,
+    /**
+     * Read only access, cannot make changes
+     */
+    READ,
+    /**
+     * Can view, read, make changes, and delete a specific entity
+     */
+    WRITE,
+    /**
+     * Can view, read, make changes, delete a specific entity, can initiate a custody transfer, and delegate permissions
+     * to another user
+     */
+    OWN,
+    /**
+     * can create new entities
+     */
+    CREATE
+    
+}

Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AllowAllAccessControlImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AllowAllAccessControlImpl.java?rev=1486693&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AllowAllAccessControlImpl.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/AllowAllAccessControlImpl.java Mon May 27 18:52:38 2013
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.juddi.security;
+
+import java.util.List;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessInfo;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.TModel;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class AllowAllAccessControlImpl implements IAccessControl{
+
+    public List<BusinessService> FilterServices(String username, List<BusinessService> services) {
+        return services;
+    }
+
+    public List<BusinessEntity> FilterBusinesses(String username, List<BusinessEntity> business) {
+        return business;
+    }
+
+    public List<TModel> FilterTModels(String username, List<TModel> tmodels) {
+        return tmodels;
+    }
+
+    public List<BindingTemplate> FilterBindingTemplates(String username, List<BindingTemplate> bindings) {
+        return bindings;
+    }
+
+    public boolean HasAccess(AccessLevel level, String username, List<String> keys) {
+        return true;
+    }
+
+    public void AssertAccess(AccessLevel level, String username, List<String> keys) {
+    }
+
+
+    public boolean IsAdmin(String username) throws IllegalArgumentException {
+        return true;
+    }
+
+
+    public List<BusinessInfo> FilterBusinessInfo(String username, List<BusinessInfo> business) {
+        return business;
+    }
+
+}

Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/DefaultCorseAccessControlImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/DefaultCorseAccessControlImpl.java?rev=1486693&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/DefaultCorseAccessControlImpl.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/DefaultCorseAccessControlImpl.java Mon May 27 18:52:38 2013
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.juddi.security;
+
+import java.util.List;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessInfo;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.TModel;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class DefaultCorseAccessControlImpl implements IAccessControl{
+
+    public List<BusinessService> FilterServices(String username, List<BusinessService> services) {
+        return services;
+    }
+
+    public List<BusinessEntity> FilterBusinesses(String username, List<BusinessEntity> business) {
+        return business;
+    }
+
+    public List<TModel> FilterTModels(String username, List<TModel> tmodels) {
+        return tmodels;
+    }
+    
+    public boolean HasAccess(AccessLevel level, String username, String key) {
+        return true;
+    }
+
+    public boolean IsAdmin(String username) throws IllegalArgumentException {
+        return true;
+    }
+
+    public List<BindingTemplate> FilterBindingTemplates(String username, List<BindingTemplate> bindings) {
+        return bindings;
+    }
+
+    @Override
+    public boolean HasAccess(AccessLevel level, String username, List<String> keys) {
+        return true;
+    }
+
+    @Override
+    public List<BusinessInfo> FilterBusinessInfo(String username, List<BusinessInfo> business) {
+        return business;
+    }
+
+    @Override
+    public void AssertAccess(AccessLevel level, String username, List<String> keys) {
+        
+    }
+
+}

Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/IAccessControl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/IAccessControl.java?rev=1486693&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/IAccessControl.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/IAccessControl.java Mon May 27 18:52:38 2013
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.juddi.security;
+
+import java.util.List;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessInfo;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.TModel;
+
+/**
+ * Provides an interface for a pluggable Fine Grained Access Control mechanism for jUDDI
+ * @author Alex O'Ree
+ * @since 3.2
+ * @see AccessLevel
+ */
+public interface IAccessControl {
+
+    public List<BusinessService> FilterServices(String username, List<BusinessService> services);
+    
+    public List<BusinessEntity> FilterBusinesses(String username, List<BusinessEntity> business);
+    
+    public List<BusinessInfo> FilterBusinessInfo(String username, List<BusinessInfo> business);
+    
+    
+    public List<TModel> FilterTModels(String username, List<TModel> tmodels);
+    
+    public List<BindingTemplate> FilterBindingTemplates(String username, List<BindingTemplate> bindings);
+    
+    public boolean HasAccess(AccessLevel level, String username, List<String> keys);
+    
+    public void AssertAccess(AccessLevel level, String username, List<String> keys);
+    /**
+     * return true if and only if the specified username has administrative rights for this instance of jUDDI
+     * @param username
+     * @return
+     * @throws IllegalArgumentException 
+     */
+    public boolean IsAdmin(String username) throws IllegalArgumentException;
+}

Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/RoleBasedAccessControlImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/RoleBasedAccessControlImpl.java?rev=1486693&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/RoleBasedAccessControlImpl.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/security/RoleBasedAccessControlImpl.java Mon May 27 18:52:38 2013
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.juddi.security;
+
+import java.util.List;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessInfo;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.TModel;
+
+/**
+ * RBAC functionality, to be pulled from J2EE container, such as Tomcat or Jboss
+ * Need to map roles to permissions via tables
+ * @author Alex O'Ree
+ */
+public class RoleBasedAccessControlImpl implements IAccessControl{
+
+    
+    public List<BusinessService> FilterServices(String username, List<BusinessService> services) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    
+    public List<BusinessEntity> FilterBusinesses(String username, List<BusinessEntity> business) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    
+    public List<TModel> FilterTModels(String username, List<TModel> tmodels) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    
+    
+    public boolean HasAccess(AccessLevel level, String username, String key) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    
+    public boolean IsAdmin(String username) throws IllegalArgumentException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    
+    public List<BindingTemplate> FilterBindingTemplates(String username, List<BindingTemplate> bindings) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public boolean HasAccess(AccessLevel level, String username, List<String> keys) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public List<BusinessInfo> FilterBusinessInfo(String username, List<BusinessInfo> business) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
+    public void AssertAccess(AccessLevel level, String username, List<String> keys) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+}

Modified: juddi/trunk/juddi-examples/uddi-createbulk/nbproject/project.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-createbulk/nbproject/project.properties?rev=1486693&r1=1486692&r2=1486693&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-createbulk/nbproject/project.properties (original)
+++ juddi/trunk/juddi-examples/uddi-createbulk/nbproject/project.properties Mon May 27 18:52:38 2013
@@ -28,7 +28,6 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.aopalliance-1.0.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/aopalliance-1.0.jar
-file.reference.asm-3.3.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/asm-3.3.jar
 file.reference.commons-beanutils-1.7.0.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-beanutils-1.7.0.jar
 file.reference.commons-beanutils-core-1.8.0.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-beanutils-core-1.8.0.jar
 file.reference.commons-codec-1.3.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-codec-1.3.jar
@@ -38,18 +37,6 @@ file.reference.commons-digester-1.8.jar=
 file.reference.commons-lang-2.4.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-lang-2.4.jar
 file.reference.commons-logging-api-1.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-logging-api-1.1.jar
 file.reference.commons-pool-1.5.4.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-pool-1.5.4.jar
-file.reference.cxf-api-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-api-2.3.1.jar
-file.reference.cxf-common-schemas-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-common-schemas-2.3.1.jar
-file.reference.cxf-common-utilities-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-common-utilities-2.3.1.jar
-file.reference.cxf-rt-bindings-soap-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-bindings-soap-2.3.1.jar
-file.reference.cxf-rt-bindings-xml-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-bindings-xml-2.3.1.jar
-file.reference.cxf-rt-core-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-core-2.3.1.jar
-file.reference.cxf-rt-databinding-jaxb-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-databinding-jaxb-2.3.1.jar
-file.reference.cxf-rt-frontend-jaxws-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-frontend-jaxws-2.3.1.jar
-file.reference.cxf-rt-frontend-simple-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-frontend-simple-2.3.1.jar
-file.reference.cxf-rt-transports-http-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-transports-http-2.3.1.jar
-file.reference.cxf-rt-ws-addr-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-ws-addr-2.3.1.jar
-file.reference.cxf-tools-common-2.3.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-tools-common-2.3.1.jar
 file.reference.geronimo-javamail_1.4_mail-1.8.2.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/geronimo-javamail_1.4_mail-1.8.2.jar
 file.reference.geronimo-javamail_1.4_spec-1.7.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/geronimo-javamail_1.4_spec-1.7.1.jar
 file.reference.geronimo-jms_1.1_spec-1.1.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/geronimo-jms_1.1_spec-1.1.1.jar
@@ -60,31 +47,19 @@ file.reference.httpcore-4.2.4.jar=../../
 file.reference.jaxb-impl-2.1.13.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/jaxb-impl-2.1.13.jar
 file.reference.juddi-client-3.2.0-SNAPSHOT.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/juddi-client-3.2.0-SNAPSHOT.jar
 file.reference.juddi-core-openjpa-3.2.0-SNAPSHOT.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/juddi-core-openjpa-3.2.0-SNAPSHOT.jar
-file.reference.neethi-2.0.4.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/neethi-2.0.4.jar
 file.reference.openjpa-2.2.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/openjpa-2.2.1.jar
 file.reference.persistence-api-1.0.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/persistence-api-1.0.jar
 file.reference.serp-1.13.1.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/serp-1.13.1.jar
-file.reference.spring-aop-3.0.5.RELEASE.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-aop-3.0.5.RELEASE.jar
-file.reference.spring-asm-3.0.5.RELEASE.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-asm-3.0.5.RELEASE.jar
-file.reference.spring-beans-3.0.5.RELEASE.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-beans-3.0.5.RELEASE.jar
-file.reference.spring-context-3.0.5.RELEASE.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-context-3.0.5.RELEASE.jar
-file.reference.spring-core-3.0.5.RELEASE.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-core-3.0.5.RELEASE.jar
-file.reference.spring-expression-3.0.5.RELEASE.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-expression-3.0.5.RELEASE.jar
-file.reference.spring-web-3.0.5.RELEASE.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-web-3.0.5.RELEASE.jar
 file.reference.stax-api-1.0-2.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/stax-api-1.0-2.jar
-file.reference.stax2-api-3.0.2.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/stax2-api-3.0.2.jar
 file.reference.uddi-ws-3.2.0-SNAPSHOT.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/uddi-ws-3.2.0-SNAPSHOT.jar
-file.reference.woodstox-core-asl-4.0.8.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/woodstox-core-asl-4.0.8.jar
 file.reference.wsdl4j-1.6.2.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/wsdl4j-1.6.2.jar
 file.reference.xml-resolver-1.2.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/xml-resolver-1.2.jar
-file.reference.XmlSchema-1.4.7.jar=../../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/XmlSchema-1.4.7.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.aopalliance-1.0.jar}:\
-    ${file.reference.asm-3.3.jar}:\
     ${file.reference.commons-beanutils-1.7.0.jar}:\
     ${file.reference.commons-beanutils-core-1.8.0.jar}:\
     ${file.reference.commons-codec-1.3.jar}:\
@@ -94,18 +69,6 @@ javac.classpath=\
     ${file.reference.commons-lang-2.4.jar}:\
     ${file.reference.commons-logging-api-1.1.jar}:\
     ${file.reference.commons-pool-1.5.4.jar}:\
-    ${file.reference.cxf-api-2.3.1.jar}:\
-    ${file.reference.cxf-common-schemas-2.3.1.jar}:\
-    ${file.reference.cxf-common-utilities-2.3.1.jar}:\
-    ${file.reference.cxf-rt-bindings-soap-2.3.1.jar}:\
-    ${file.reference.cxf-rt-bindings-xml-2.3.1.jar}:\
-    ${file.reference.cxf-rt-core-2.3.1.jar}:\
-    ${file.reference.cxf-rt-databinding-jaxb-2.3.1.jar}:\
-    ${file.reference.cxf-rt-frontend-jaxws-2.3.1.jar}:\
-    ${file.reference.cxf-rt-frontend-simple-2.3.1.jar}:\
-    ${file.reference.cxf-rt-transports-http-2.3.1.jar}:\
-    ${file.reference.cxf-rt-ws-addr-2.3.1.jar}:\
-    ${file.reference.cxf-tools-common-2.3.1.jar}:\
     ${file.reference.geronimo-javamail_1.4_mail-1.8.2.jar}:\
     ${file.reference.geronimo-javamail_1.4_spec-1.7.1.jar}:\
     ${file.reference.geronimo-jms_1.1_spec-1.1.1.jar}:\
@@ -116,24 +79,13 @@ javac.classpath=\
     ${file.reference.jaxb-impl-2.1.13.jar}:\
     ${file.reference.juddi-client-3.2.0-SNAPSHOT.jar}:\
     ${file.reference.juddi-core-openjpa-3.2.0-SNAPSHOT.jar}:\
-    ${file.reference.neethi-2.0.4.jar}:\
     ${file.reference.openjpa-2.2.1.jar}:\
     ${file.reference.persistence-api-1.0.jar}:\
     ${file.reference.serp-1.13.1.jar}:\
-    ${file.reference.spring-aop-3.0.5.RELEASE.jar}:\
-    ${file.reference.spring-asm-3.0.5.RELEASE.jar}:\
-    ${file.reference.spring-beans-3.0.5.RELEASE.jar}:\
-    ${file.reference.spring-context-3.0.5.RELEASE.jar}:\
-    ${file.reference.spring-core-3.0.5.RELEASE.jar}:\
-    ${file.reference.spring-expression-3.0.5.RELEASE.jar}:\
-    ${file.reference.spring-web-3.0.5.RELEASE.jar}:\
     ${file.reference.stax-api-1.0-2.jar}:\
-    ${file.reference.stax2-api-3.0.2.jar}:\
     ${file.reference.uddi-ws-3.2.0-SNAPSHOT.jar}:\
-    ${file.reference.woodstox-core-asl-4.0.8.jar}:\
     ${file.reference.wsdl4j-1.6.2.jar}:\
-    ${file.reference.xml-resolver-1.2.jar}:\
-    ${file.reference.XmlSchema-1.4.7.jar}
+    ${file.reference.xml-resolver-1.2.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=1486693&r1=1486692&r2=1486693&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Mon May 27 18:52:38 2013
@@ -465,7 +465,7 @@ public class UDDI_080_SubscriptionIntegr
             tckSubscription.subscription.saveSubscription(authInfoJoe, data);
             Assert.fail();
         } catch (Exception ex) {
-            HandleException(ex);
+//            HandleException(ex);
             //Assert.fail();
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org