Author: alexoree
Date: Fri Jun 14 22:42:08 2013
New Revision: 1493271
URL: http://svn.apache.org/r1493271
Log:
JUDDI-599 Refactoring juddi rest services into a separate module
Added:
juddi/trunk/juddi-rest-cxf/ (with props)
juddi/trunk/juddi-rest-cxf/src/
juddi/trunk/juddi-rest-cxf/src/main/
juddi/trunk/juddi-rest-cxf/src/main/java/
juddi/trunk/juddi-rest-cxf/src/main/java/org/
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
- copied, changed from r1490802,
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
Removed:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/rest/
Modified:
juddi/trunk/juddiv3-war/pom.xml
juddi/trunk/pom.xml
Propchange: juddi/trunk/juddi-rest-cxf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 14 22:42:08 2013
@@ -0,0 +1 @@
+target
Copied:
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
(from r1490802,
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java)
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java?p2=juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java&p1=juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java&r1=1490802&r2=1493271&rev=1493271&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
(original)
+++
juddi/trunk/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
Fri Jun 14 22:42:08 2013
@@ -25,18 +25,21 @@ import org.uddi.v3_service.DispositionRe
/**
* UDDI Inquiry functions via a JAX-RS REST API. It's basically a wrapper for
- * the REST fans to access UDDI from a URL pattern
+ * the REST fans to access UDDI from a URL pattern This class will ONLY deploy
+ * using the Apache CXF WS stack for REST (JAX-RS)
*
* @author Alex O'Ree
*/
@Path("/")
@Produces("application/xml")
[email protected]("This service provides access to
UDDI data via a REST interface")
public class UDDIInquiryJAXRS {
private static org.apache.juddi.api.impl.UDDIInquiryImpl inquiry = new
UDDIInquiryImpl();
private static Log log = LogFactory.getLog(UDDIInquiryJAXRS.class);
/**
+ * Returns the details of a business entity in JSON
*
* @param id
* @return
@@ -44,13 +47,22 @@ public class UDDIInquiryJAXRS {
@GET
@Path("/JSON/businessDetail/{id}")
@Produces("application/json")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the details of a
business entity in JSON")
public org.uddi.api_v3.BusinessEntity
getBusinessDetailJSON(@PathParam("id") String id) throws
WebApplicationException {
return getBusinessDetail(id);
}
+ /**
+ * Returns the details of a business entity in XML
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/XML/businessDetail/{id}")
@Produces("application/xml")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the details of a
business entity in XML")
public org.uddi.api_v3.BusinessEntity
getBusinessDetailXML(@PathParam("id") String id) throws WebApplicationException
{
return getBusinessDetail(id);
}
@@ -68,16 +80,32 @@ public class UDDIInquiryJAXRS {
return null;
}
+ /**
+ * Returns the details of a tModel entity in XML
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/XML/tModelDetail/{id}")
@Produces("application/xml")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the details of a
tModel entity in XML")
public org.uddi.api_v3.TModel getTModelDetailXML(@PathParam("id") String
id) throws WebApplicationException {
return getTModelDetail(id);
}
+ /**
+ * Returns the details of a tModel entity in JSON
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/JSON/tModelDetail/{id}")
@Produces("application/json")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the details of a
tModel entity in JSON")
public org.uddi.api_v3.TModel getTModelDetailJSON(@PathParam("id") String
id) throws WebApplicationException {
return getTModelDetail(id);
}
@@ -95,16 +123,32 @@ public class UDDIInquiryJAXRS {
return null;
}
+ /**
+ * Returns the details of a service entity in JSON
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/XML/serviceDetail/{id}")
@Produces("application/json")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the details of a
service entity in JSON")
public org.uddi.api_v3.BusinessService
getServiceDetailJSON(@PathParam("id") String id) throws WebApplicationException
{
return getServiceDetail(id);
}
+ /**
+ * Returns the details of a service entity in XML
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/XML/serviceDetail/{id}")
@Produces("application/xml")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the details of a
service entity in XML")
public org.uddi.api_v3.BusinessService
getServiceDetailXML(@PathParam("id") String id) throws WebApplicationException {
return getServiceDetail(id);
}
@@ -122,27 +166,39 @@ public class UDDIInquiryJAXRS {
return null;
}
-
-
-
-
+ /**
+ * Returns the operational details of a given entity in JSON
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/XML/opInfo/{id}")
@Produces("application/json")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the operational
details of a given entity in JSON")
public org.uddi.api_v3.OperationalInfo getOpInfoJSON(@PathParam("id")
String id) throws WebApplicationException {
return getOpInfoDetail(id);
}
+ /**
+ * Returns the operational details of a given entity in XML
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/XML/opInfo/{id}")
@Produces("application/xml")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the operational
details of a given entity in XML")
public org.uddi.api_v3.OperationalInfo getOpInfoXML(@PathParam("id")
String id) throws WebApplicationException {
return getOpInfoDetail(id);
}
private OperationalInfo getOpInfoDetail(String id) {
- GetOperationalInfo req = new GetOperationalInfo();
- req.getEntityKey().add(id);
+ GetOperationalInfo req = new GetOperationalInfo();
+ req.getEntityKey().add(id);
try {
OperationalInfos operationalInfo = inquiry.getOperationalInfo(req);
return operationalInfo.getOperationalInfo().get(0);
@@ -151,29 +207,40 @@ public class UDDIInquiryJAXRS {
}
return null;
}
-
-
-
-
-
-
+
+ /**
+ * Returns the binding details of a given entity in JSON
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/XML/bindingDetail/{id}")
@Produces("application/json")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the binding details
of a given entity in JSON")
public org.uddi.api_v3.BindingTemplate
getBindingDetailJSON(@PathParam("id") String id) throws WebApplicationException
{
return getBindingDetail(id);
}
+ /**
+ * Returns the binding details of a given entity in XML
+ *
+ * @param id
+ * @return
+ * @throws WebApplicationException
+ */
@GET
@Path("/XML/bindingDetail/{id}")
@Produces("application/xml")
+ @org.apache.cxf.jaxrs.model.wadl.Description("Returns the binding details
of a given entity in XML")
public org.uddi.api_v3.BindingTemplate
getBindingDetailXML(@PathParam("id") String id) throws WebApplicationException {
return getBindingDetail(id);
}
private BindingTemplate getBindingDetail(String id) {
- GetBindingDetail req = new GetBindingDetail();
- req.getBindingKey().add(id);
+ GetBindingDetail req = new GetBindingDetail();
+ req.getBindingKey().add(id);
try {
BindingDetail bindingDetail = inquiry.getBindingDetail(null);
return bindingDetail.getBindingTemplate().get(0);
@@ -182,9 +249,6 @@ public class UDDIInquiryJAXRS {
}
return null;
}
-
-
-
private static void HandleException(DispositionReportFaultMessage ex)
throws WebApplicationException {
if (ex == null) {
Modified: juddi/trunk/juddiv3-war/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/pom.xml?rev=1493271&r1=1493270&r2=1493271&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/pom.xml (original)
+++ juddi/trunk/juddiv3-war/pom.xml Fri Jun 14 22:42:08 2013
@@ -135,6 +135,11 @@
<groupId>org.apache.juddi</groupId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <artifactId>juddi-rest-cxf</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -192,6 +197,11 @@
<groupId>org.apache.juddi</groupId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <artifactId>juddi-rest-cxf</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -267,11 +277,29 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <artifactId>juddi-rest-cxf</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
+ <!--added AO 6/8/2013 support for JSON encoding
on REST endpoints -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+
<artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>2.7.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.3</version>
+ </dependency>
+ <!--END added AO 6/8/2013 support for JSON
encoding on REST endpoints -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
Modified: juddi/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/pom.xml?rev=1493271&r1=1493270&r2=1493271&view=diff
==============================================================================
--- juddi/trunk/pom.xml (original)
+++ juddi/trunk/pom.xml Fri Jun 14 22:42:08 2013
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- */ -->
-<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";>
+ */ --><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</groupId>
@@ -129,6 +128,13 @@
<url>http://www.apache.org</url>
<organization>ASF</organization>
</developer>
+ <developer>
+ <id>alexoree</id>
+ <name>Alex O'Ree</name>
+ <email>alexoree AT apache.org</email>
+ <url>http://www.apache.org</url>
+ <organization>ASF</organization>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -265,6 +271,7 @@
<module>uddi-tck-base</module>
<module>juddi-client</module>
<module>juddi-core</module>
+ <module>juddi-rest-cxf</module>
<module>juddi-core-openjpa</module>
<module>juddiv3-war</module>
<module>juddi-examples</module>
@@ -272,7 +279,8 @@
<module>juddi-gui</module>
<module>juddi-tomcat</module>
<module>uddi-tck</module>
- </modules>
+
+ </modules>
<distributionManagement>
<site>
<id>website</id>
@@ -380,4 +388,4 @@
</profile>
<!-- END SNIPPET: release-profile -->
</profiles>
-</project>
+</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
