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 2014/01/26 02:34:55 UTC
svn commit: r1561432 - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/annotations/
juddi-client/src/main/java/org/apache/juddi/v3/client/
juddi-client/src/main/java/org/apache/juddi/v3/client/compare/
juddi-client/src/main/java/org/apa...
Author: alexoree
Date: Sun Jan 26 01:34:54 2014
New Revision: 1561432
URL: http://svn.apache.org/r1561432
Log:
JUDDI-794 fixed
JUDDI-819 done
Added:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ext/wsdm/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/i18n/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/package-info.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/error/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/package-info.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/package-info.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/package-info.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/package-info.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/package-info.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIApi.java
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/annotations/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Java annotation wrappers to automate UDDI registration
+ */
+package org.apache.juddi.v3.annotations;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Helper functions to compare various elements returned from UDDI
+ */
+package org.apache.juddi.v3.client.compare;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Main integration point for client applications, configuration, clerks
+ */
+package org.apache.juddi.v3.client.config;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Cryptographic functions for all passwords and digital signatures
+ */
+package org.apache.juddi.v3.client.cryptor;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Enables clients to use jUDDI services without a web app server
+ */
+package org.apache.juddi.v3.client.embed;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ext/wsdm/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ext/wsdm/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ext/wsdm/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/ext/wsdm/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Contains OASIS's Web Services Distributed Management constants
+ */
+package org.apache.juddi.v3.client.ext.wsdm;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/i18n/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/i18n/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/i18n/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/i18n/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Internationalization helper functions
+ */
+package org.apache.juddi.v3.client.i18n;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Mappings for UDDIv2 APIs and for common functions for WADL and WSDL to UDDI
+ */
+package org.apache.juddi.v3.client.mapping;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java?rev=1561432&r1=1561431&r2=1561432&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wadl/package-info.java Sun Jan 26 01:34:54 2014
@@ -4,6 +4,8 @@
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2013.05.27 at 06:54:03 PM EDT
//
-
+/**
+ * JAXB Generated classes for WADL and WADL2UDDI parser
+ */
@javax.xml.bind.annotation.XmlSchema(namespace = "http://wadl.dev.java.net/2009/02", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.juddi.v3.client.mapping.wadl;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * WSDL and BPEL to UDDI parsers
+ */
+package org.apache.juddi.v3.client.mapping.wsdl;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * UDDI Constants and web service clients
+ */
+package org.apache.juddi.v3.client;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * An asynchronous API for subscriptions using an embedded web server
+ */
+package org.apache.juddi.v3.client.subscription;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * UDDI API Transport classes, such as JAXWS, RMI, etc
+ */
+package org.apache.juddi.v3.client.transport;
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/package-info.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Provides compatibility with SCOUT and UDDIv2 API sets
+ */
+package org.apache.juddi.v3.client.transport.wrapper;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java?rev=1561432&r1=1561431&r2=1561432&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java Sun Jan 26 01:34:54 2014
@@ -320,8 +320,9 @@ public class JUDDIApiImpl extends Authen
/**
* Completely deletes a tModel from the persistence layer.
* Administrative privilege required. All entities that reference this tModel
- * will no longer be able to use the tModel if jUDDI Option Enforce referential Integrity is enabled.
- * @see Property.JUDDI_ENFORCE_REFERENTIAL_INTEGRITY
+ * will no longer be able to use the tModel if jUDDI Option Enforce referential Integrity is enabled.<br>
+ * Required permission, you must be am administrator
+ * {@link Property#JUDDI_ENFORCE_REFERENTIAL_INTEGRITY}
* @param body
* @throws DispositionReportFaultMessage
*/
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * This package contains the web service implementation classes of all jUDDI services
+ */
+package org.apache.juddi.api.impl;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * JPA Query Utilities and helpers functions
+ */
+package org.apache.juddi.api.util;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java?rev=1561432&r1=1561431&r2=1561432&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Install.java Sun Jan 26 01:34:54 2014
@@ -340,7 +340,7 @@ public class Install {
throw new KeyUnavailableException(new ErrorMessage("errors.keyunavailable.BadPartition", entityKey));
}
- ValidatePublish validatePublish = new ValidatePublish(rootPublisher);
+ ValidatePublish validatePublish = new ValidatePublish(rootPublisher, config.getString(Property.JUDDI_NODE_ID));
validatePublish.validateNames(businessEntity.getName());
validatePublish.validateDiscoveryUrls(businessEntity.getDiscoveryURLs());
@@ -395,7 +395,7 @@ public class Install {
throw new KeyUnavailableException(new ErrorMessage("errors.keyunavailable.BadPartition", entityKey));
}
- ValidatePublish validatePublish = new ValidatePublish(rootPublisher);
+ ValidatePublish validatePublish = new ValidatePublish(rootPublisher, config.getString(Property.JUDDI_NODE_ID));
validatePublish.validateNames(businessService.getName());
validatePublish.validateCategoryBag(businessService.getCategoryBag(), config,true);
@@ -446,7 +446,7 @@ public class Install {
throw new KeyUnavailableException(new ErrorMessage("errors.keyunavailable.BadPartition", entityKey));
}
- ValidatePublish validatePublish = new ValidatePublish(rootPublisher);
+ ValidatePublish validatePublish = new ValidatePublish(rootPublisher, config.getString(Property.JUDDI_NODE_ID));
validatePublish.validateCategoryBag(bindingTemplate.getCategoryBag(), config,true);
validatePublish.validateTModelInstanceDetails(bindingTemplate.getTModelInstanceDetails(),config,true);
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * All configuration related classes
+ */
+package org.apache.juddi.config;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Cryptographic functions
+ */
+package org.apache.juddi.cryptor;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/keygen/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * UDDI Key Generator classes
+ */
+package org.apache.juddi.keygen;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Maps to and from JAXB to JPA classes
+ */
+package org.apache.juddi.mapping;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * JPA representations of the JAXB classes from uddi-ws
+ */
+package org.apache.juddi.model;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * JPA Queries for all UDDI functions
+ */
+package org.apache.juddi.query;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/rmi/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * jUDDI's RMI Transport wrappers
+ */
+package org.apache.juddi.rmi;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Handles transport specific notifications
+ */
+package org.apache.juddi.subscription.notify;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Handles all asynchronous notifications
+ */
+package org.apache.juddi.subscription;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * jUDDI User Authentication
+ */
+package org.apache.juddi.v3.auth;
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/error/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/error/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/error/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/error/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * All UDDI spec defined exceptions
+ */
+package org.apache.juddi.v3.error;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=1561432&r1=1561431&r2=1561432&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java Sun Jan 26 01:34:54 2014
@@ -107,7 +107,11 @@ public class ValidatePublish extends Val
*/
private Log log = LogFactory.getLog(this.getClass());
- public ValidatePublish(UddiEntityPublisher publisher) {
+ public ValidatePublish(UddiEntityPublisher publisher, String nodeid) {
+ super(publisher,nodeid);
+ }
+
+ public ValidatePublish(UddiEntityPublisher publisher) {
super(publisher);
}
@@ -181,10 +185,11 @@ public class ValidatePublish extends Val
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.ServiceNotFound", entityKey));
}
- if (!publisher.isOwner((UddiEntity) obj) && !((Publisher) publisher).isAdmin() ) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- }
-
+ //if you're are the owner, access granted
+ //if you are an admin && this item belongs to this node, access granted
+ //else denied
+
+ AccessCheck(obj, entityKey);
i++;
}
}
@@ -220,10 +225,8 @@ public class ValidatePublish extends Val
if (obj == null) {
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.BindingTemplateNotFound", entityKey));
}
-
- if (!publisher.isOwner((UddiEntity) obj) && !((Publisher) publisher).isAdmin() ) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- }
+
+ AccessCheck(obj, entityKey);
i++;
}
@@ -260,13 +263,28 @@ public class ValidatePublish extends Val
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.TModelNotFound", entityKey));
}
- if (!publisher.isOwner((UddiEntity) obj) && !((Publisher) publisher).isAdmin() ) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- }
+ AccessCheck(obj, entityKey);
i++;
}
}
+
+ private void AccessCheck(Object obj, String entityKey) throws UserMismatchException{
+ boolean accessCheck=false; //assume access denied
+ if (publisher.isOwner((UddiEntity) obj)){
+ accessCheck=true;
+
+ }
+ if (((Publisher) publisher).isAdmin() &&
+ nodeID.equals(((UddiEntity) obj).getNodeId())){
+ accessCheck=true;
+ }
+
+ if (!accessCheck ) {
+ throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
+ }
+
+ }
public void validateDeletePublisherAssertions(EntityManager em, DeletePublisherAssertions body) throws DispositionReportFaultMessage {
@@ -648,9 +666,8 @@ public class ValidatePublish extends Val
entityExists = true;
// Make sure publisher owns this entity.
- if (!publisher.isOwner((UddiEntity) obj) && !((Publisher) publisher).isAdmin()) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- }
+ AccessCheck(obj, entityKey);
+
} else {
// Inside this block, we have a key proposed by the publisher on a new entity
@@ -783,10 +800,9 @@ public class ValidatePublish extends Val
businessService.setBusinessKey(parentKey);
}
+
// Make sure publisher owns this entity.
- if (!publisher.isOwner((UddiEntity) obj) && !((Publisher) publisher).isAdmin()) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- }
+ AccessCheck(obj, entityKey);
// If existing service trying to be saved has a different parent key, then we have a problem
if (!parentKey.equalsIgnoreCase(bs.getBusinessEntity().getEntityKey())) {
@@ -831,9 +847,10 @@ public class ValidatePublish extends Val
}
// Make sure publisher owns this parent entity.
- if (!publisher.isOwner((UddiEntity) parentTemp)) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwnerParent", parentKey));
- }
+ AccessCheck(parentTemp, parentKey);
+ // if (!publisher.isOwner((UddiEntity) parentTemp)) {
+ // throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwnerParent", parentKey));
+ //}
}
}
@@ -939,9 +956,10 @@ public class ValidatePublish extends Val
}
// Make sure publisher owns this entity.
- if (!publisher.isOwner((UddiEntity) obj)&& !((Publisher) publisher).isAdmin()) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- }
+ AccessCheck(obj, entityKey);
+ //if (!publisher.isOwner((UddiEntity) obj)&& !((Publisher) publisher).isAdmin()) {
+// throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
+ // }
} else {
// Inside this block, we have a key proposed by the publisher on a new entity
@@ -973,9 +991,10 @@ public class ValidatePublish extends Val
}
// Make sure publisher owns this parent entity.
- if (!publisher.isOwner((UddiEntity) parentTemp)) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwnerParent", parentKey));
- }
+ AccessCheck(parentTemp, parentKey);
+// if (!publisher.isOwner((UddiEntity) parentTemp)) {
+// throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwnerParent", parentKey));
+// }
}
}
@@ -1028,9 +1047,10 @@ public class ValidatePublish extends Val
entityExists = true;
// Make sure publisher owns this entity.
- if (!publisher.isOwner((UddiEntity) obj)&& !((Publisher) publisher).isAdmin()) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- }
+ AccessCheck(obj, entityKey);
+ //if (!publisher.isOwner((UddiEntity) obj)&& !((Publisher) publisher).isAdmin()) {
+ // throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
+ // }
} else {
// Inside this block, we have a key proposed by the publisher on a new entity
@@ -1600,9 +1620,9 @@ public class ValidatePublish extends Val
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.TModelNotFound", entityKey));
}
- if (!publisher.isOwner((UddiEntity) obj)) {
- throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
- }
+ //if (!publisher.isOwner((UddiEntity) obj)) {
+ // throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
+ //}
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIApi.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIApi.java?rev=1561432&r1=1561431&r2=1561432&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIApi.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIApi.java Sun Jan 26 01:34:54 2014
@@ -18,7 +18,12 @@
package org.apache.juddi.validation;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.persistence.EntityManager;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.Property;
import org.apache.juddi.model.Subscription;
import org.apache.juddi.model.UddiEntity;
@@ -33,9 +38,26 @@ import org.uddi.v3_service.DispositionRe
public abstract class ValidateUDDIApi {
protected UddiEntityPublisher publisher;
+ protected String nodeID=null;
- public ValidateUDDIApi(UddiEntityPublisher publisher) {
+ /**
+ * This is used only during the install process to prevent infinite loops
+ * @param publisher
+ * @param nodeid
+ */
+ public ValidateUDDIApi(UddiEntityPublisher publisher, String nodeid) {
this.publisher = publisher;
+ this.nodeID = nodeid;
+ }
+
+ public ValidateUDDIApi(UddiEntityPublisher publisher) {
+ this.publisher = publisher;
+ try {
+ this.nodeID = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
+ } catch (ConfigurationException ex) {
+ Logger.getLogger(ValidateUDDIApi.class.getName()).log(Level.SEVERE, "unable to get the current node id, this may cause access control problems"
+ + " and must be fixed. set " + Property.JUDDI_NODE_ID + " in juddiv3.xml", ex);
+ }
}
public UddiEntityPublisher getPublisher() {
Added: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/package-info.java (added)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Validators for all UDDI method invocations against the rules defined in the spec
+ */
+package org.apache.juddi.validation;
Added: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/package-info.java (added)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Parsers and helper functions
+ */
+package org.apache.juddi.webconsole.hub.builders;
Added: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/package-info.java (added)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Rendererss, parses, configuration and session management for all juddi-gui web apps
+ */
+package org.apache.juddi.webconsole.hub;
Added: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/package-info.java (added)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * Contains servlet filters, constants, some exceptions and session encryption keys
+ */
+package org.apache.juddi.webconsole;
Added: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/package-info.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/package-info.java?rev=1561432&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/package-info.java (added)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/package-info.java Sun Jan 26 01:34:54 2014
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 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.
+ */
+/**
+ * i18n support
+ */
+package org.apache.juddi.webconsole.resources;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org