You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2010/03/18 12:49:30 UTC
svn commit: r924734 - in /incubator/ace/trunk: ace-client-repository-impl/
ace-client-repository-useradmin/ ace-client-repository/
ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/
ace-resourceprocessor-useradmin...
Author: marrs
Date: Thu Mar 18 11:49:30 2010
New Revision: 924734
URL: http://svn.apache.org/viewvc?rev=924734&view=rev
Log:
More fixes to poms and bnd files. Added server side logging to the checkout service when something goes wrong on the client, so errors that are experienced by the user are always logged on the server. Added a warning when an exception occurs in the update UserAdmin task.
Modified:
incubator/ace/trunk/ace-client-repository-impl/osgi.bnd
incubator/ace/trunk/ace-client-repository-impl/pom.xml
incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd
incubator/ace/trunk/ace-client-repository/osgi.bnd
incubator/ace/trunk/ace-client-repository/pom.xml
incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java
incubator/ace/trunk/ace-resourceprocessor-useradmin/osgi.bnd
incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/CheckoutServiceImpl.java
Modified: incubator/ace/trunk/ace-client-repository-impl/osgi.bnd
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/osgi.bnd?rev=924734&r1=924733&r2=924734&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/osgi.bnd (original)
+++ incubator/ace/trunk/ace-client-repository-impl/osgi.bnd Thu Mar 18 11:49:30 2010
@@ -14,5 +14,5 @@ Export-Package:\
Import-Package: *;resolution:=optional
Embed-Dependency:\
- xstream
+ xstream, xpp3
\ No newline at end of file
Modified: incubator/ace/trunk/ace-client-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/pom.xml?rev=924734&r1=924733&r2=924734&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository-impl/pom.xml Thu Mar 18 11:49:30 2010
@@ -81,6 +81,11 @@
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.4c</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd?rev=924734&r1=924733&r2=924734&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd (original)
+++ incubator/ace/trunk/ace-client-repository-useradmin/osgi.bnd Thu Mar 18 11:49:30 2010
@@ -7,3 +7,5 @@ Bundle-SymbolicName:\
Export-Package:\
${bundle.namespace}; version="${pom.version}"
+Bundle-Activator: \
+ ${bundle.namespace}.impl.Activator
\ No newline at end of file
Modified: incubator/ace/trunk/ace-client-repository/osgi.bnd
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository/osgi.bnd?rev=924734&r1=924733&r2=924734&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository/osgi.bnd (original)
+++ incubator/ace/trunk/ace-client-repository/osgi.bnd Thu Mar 18 11:49:30 2010
@@ -9,4 +9,4 @@ Export-Package:
Import-Package: *;resolution:=optional
Embed-Dependency: \
- velocity
+ velocity, xpp3
Modified: incubator/ace/trunk/ace-client-repository/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository/pom.xml?rev=924734&r1=924733&r2=924734&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository/pom.xml (original)
+++ incubator/ace/trunk/ace-client-repository/pom.xml Thu Mar 18 11:49:30 2010
@@ -72,6 +72,12 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.4c</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java?rev=924734&r1=924733&r2=924734&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java (original)
+++ incubator/ace/trunk/ace-configurator-useradmin-task/src/main/java/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java Thu Mar 18 11:49:30 2010
@@ -73,6 +73,7 @@ public class UpdateUserAdminTask impleme
catch (IOException e) {
// If anything went wrong, this means the remote repository is not available;
// this also means the UserAdmin is left undisturbed.
+ m_log.log(LogService.LOG_WARNING, "Error running update UserAdmin task.", e);
}
}
Modified: incubator/ace/trunk/ace-resourceprocessor-useradmin/osgi.bnd
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-resourceprocessor-useradmin/osgi.bnd?rev=924734&r1=924733&r2=924734&view=diff
==============================================================================
--- incubator/ace/trunk/ace-resourceprocessor-useradmin/osgi.bnd (original)
+++ incubator/ace/trunk/ace-resourceprocessor-useradmin/osgi.bnd Thu Mar 18 11:49:30 2010
@@ -7,3 +7,5 @@ Bundle-SymbolicName:\
Export-Package:\
${bundle.namespace}; version="${pom.version}"
+Bundle-Activator: \
+ ${bundle.namespace}.impl.Activator
\ No newline at end of file
Modified: incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/CheckoutServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/CheckoutServiceImpl.java?rev=924734&r1=924733&r2=924734&view=diff
==============================================================================
--- incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/CheckoutServiceImpl.java (original)
+++ incubator/ace/trunk/legacy/webui/src/org/apache/ace/server/CheckoutServiceImpl.java Thu Mar 18 11:49:30 2010
@@ -25,6 +25,7 @@ import java.util.Set;
import org.apache.ace.client.repository.RepositoryAdmin;
import org.apache.ace.client.repository.RepositoryAdminLoginContext;
import org.apache.ace.client.services.CheckoutService;
+import org.osgi.service.log.LogService;
import org.osgi.service.useradmin.User;
import org.osgi.service.useradmin.UserAdmin;
@@ -58,15 +59,33 @@ public class CheckoutServiceImpl extends
}
public void checkout() throws Exception {
- getRepositoryAdmin().checkout();
+ try {
+ getRepositoryAdmin().checkout();
+ }
+ catch (Exception e) {
+ Activator.instance().getLog().log(LogService.LOG_WARNING, "Checkout failed", e);
+ throw e;
+ }
}
public void commit() throws Exception {
- getRepositoryAdmin().commit();
+ try {
+ getRepositoryAdmin().commit();
+ }
+ catch (Exception e) {
+ Activator.instance().getLog().log(LogService.LOG_WARNING, "Commit failed", e);
+ throw e;
+ }
}
public void revert() throws Exception {
- getRepositoryAdmin().revert();
+ try {
+ getRepositoryAdmin().revert();
+ }
+ catch (Exception e) {
+ Activator.instance().getLog().log(LogService.LOG_WARNING, "Revert failed", e);
+ throw e;
+ }
}
}