Author: alexoree
Date: Sat Feb 1 00:57:08 2014
New Revision: 1563359
URL: http://svn.apache.org/r1563359
Log:
JUDDI-829 fixed via the mapper, fixing NPE for save binding list info
JUDDI-828 apply web.xml fix
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java?rev=1563359&r1=1563358&r2=1563359&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java
Sat Feb 1 00:57:08 2014
@@ -280,7 +280,7 @@ public class MapUDDIv2Tov3 {
}
private static TModelInstanceDetails
MapTModelInstanceDetails(org.uddi.api_v2.TModelInstanceDetails
tModelInstanceDetails) {
- if (tModelInstanceDetails == null) {
+ if (tModelInstanceDetails == null |
tModelInstanceDetails.getTModelInstanceInfo().isEmpty()) {
return null;
}
TModelInstanceDetails r = new TModelInstanceDetails();
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java?rev=1563359&r1=1563358&r2=1563359&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
Sat Feb 1 00:57:08 2014
@@ -72,6 +72,7 @@ import org.apache.juddi.config.Persisten
import org.apache.juddi.config.Property;
import org.apache.juddi.query.util.DynamicQuery;
import org.apache.juddi.query.util.FindQualifiers;
+import org.uddi.api_v3.ListDescription;
/**
* This class implements the UDDI Publication Service
@@ -525,7 +526,7 @@ public class UDDIPublicationImpl extends
validator.validateSaveBinding(em, body, null);
BindingDetail result = new BindingDetail();
-
+ result.setListDescription(new ListDescription());
List<org.uddi.api_v3.BindingTemplate>
apiBindingTemplateList = body.getBindingTemplate();
for (org.uddi.api_v3.BindingTemplate apiBindingTemplate
: apiBindingTemplateList) {
@@ -541,7 +542,8 @@ public class UDDIPublicationImpl extends
em.persist(modelBindingTemplate);
result.getBindingTemplate().add(apiBindingTemplate);
-
+
result.getListDescription().setActualCount(result.getListDescription().getActualCount()+1);
+
result.getListDescription().setIncludeCount(result.getListDescription().getIncludeCount()+1);
validator.validateSaveBindingMax(em,
modelBindingTemplate.getBusinessService().getEntityKey());
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml?rev=1563359&r1=1563358&r2=1563359&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml Sat Feb 1 00:57:08
2014
@@ -96,12 +96,4 @@
<security-role>
<role-name>uddiadmin</role-name>
</security-role>
-<!-- if deployment fails, try commenting this out -->
- <init-param>
- <param-name>trimSpaces</param-name>
- <param-value>true</param-value>
- </init-param>
-<!-- end -->
-
-
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
