You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ey...@apache.org on 2011/09/23 03:54:10 UTC
svn commit: r1174497 - in /incubator/ambari/trunk: controller/pom.xml
controller/src/main/java/org/apache/ambari/controller/Controller.java
controller/src/main/java/org/apache/ambari/controller/rest/config/ExtendedWadlGeneratorConfig.java
pom.xml
Author: eyang
Date: Fri Sep 23 01:54:09 2011
New Revision: 1174497
URL: http://svn.apache.org/viewvc?rev=1174497&view=rev
Log:
AMBARI-7. Updated Jersey to 1.9 for automating wadl generation. (Eric Yang)
Modified:
incubator/ambari/trunk/controller/pom.xml
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/config/ExtendedWadlGeneratorConfig.java
incubator/ambari/trunk/pom.xml
Modified: incubator/ambari/trunk/controller/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/pom.xml?rev=1174497&r1=1174496&r2=1174497&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/pom.xml (original)
+++ incubator/ambari/trunk/controller/pom.xml Fri Sep 23 01:54:09 2011
@@ -85,7 +85,6 @@
</executions>
<configuration>
-
<encoding>UTF-8</encoding>
<verbose>false</verbose>
<show>public</show>
@@ -101,7 +100,7 @@
Also specify jersey and xerces as doclet artifacts as the ResourceDoclet
uses classes provided by them to generate the resourcedoc.
-->
-<!-- <docletArtifact>
+ <!--<docletArtifact>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.6</version>
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java?rev=1174497&r1=1174496&r2=1174497&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java Fri Sep 23 01:54:09 2011
@@ -80,7 +80,7 @@ public class Controller {
}
public static void main(String[] args) {
- //DaemonWatcher.createInstance(System.getProperty("PID"), 9100);
+ DaemonWatcher.createInstance(System.getProperty("PID"), 9100);
try {
Controller controller = Controller.getInstance();
if (controller != null) {
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/config/ExtendedWadlGeneratorConfig.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/config/ExtendedWadlGeneratorConfig.java?rev=1174497&r1=1174496&r2=1174497&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/config/ExtendedWadlGeneratorConfig.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/rest/config/ExtendedWadlGeneratorConfig.java Fri Sep 23 01:54:09 2011
@@ -13,8 +13,8 @@ public class ExtendedWadlGeneratorConfig
public List<WadlGeneratorDescription> configure() {
return generator(WadlGeneratorGrammarsSupport.class)
.prop("grammarsStream", "application-grammars.xml")
- .generator(WadlGeneratorResourceDocSupport.class)
- .prop("resourceDocStream", "resourcedoc.xml")
+ //.generator(WadlGeneratorResourceDocSupport.class)
+ //.prop("resourceDocStream", "resourcedoc.xml")
.descriptions();
}
}
Modified: incubator/ambari/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/pom.xml?rev=1174497&r1=1174496&r2=1174497&view=diff
==============================================================================
--- incubator/ambari/trunk/pom.xml (original)
+++ incubator/ambari/trunk/pom.xml Fri Sep 23 01:54:09 2011
@@ -147,18 +147,18 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>1.6</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.6</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>1.6</version>
+ <version>1.9</version>
</dependency>
</dependencies>