On Fri, May 27, 2011 at 3:22 PM, Reto Bachmann-Gmuer > > btw: the command needed to revert CLEREZZA-515 in trunk is: > > svn merge -r 1125855:1125850 > https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/ > > svn commit -m "CLEREZZA-515: reverting changes as requested on list" > > Sorry, the above reverts to much as there are other versions in between (including the revert I did when you requested me to revert an issue).
Now tried: reto@reto-HPE-540ch:~/projects/apache/clerezza/trunk/parent$ svn merge -r 1125855:1125854 https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/ --- Reverse-merging r1125855 into '.': U platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala reto@reto-HPE-540ch:~/projects/apache/clerezza/trunk/parent$ svn merge -r 1125851:1125850 https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/ --- Reverse-merging r1125851 into 'web.resources.style': U web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp --- Reverse-merging r1125851 into 'platform.security': U platform.security/src/main/java/org/apache/clerezza/platform/security/auth/PrincipalImpl.java D platform.security/src/main/java/org/apache/clerezza/platform/security/auth/WebIdPrincipal.java U platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java U platform.security/src/main/java/org/apache/clerezza/platform/security/UserAwarePolicy.java U platform.security/src/main/java/org/apache/clerezza/platform/security/UserUnregisteredException.java --- Reverse-merging r1125851 into 'platform.usermanager': U platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java U platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java U platform.usermanager/pom.xml --- Reverse-merging r1125851 into '.': U platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java U platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/WebIDTester.scala U platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/FoafSslAuthentication.scala U platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/WebIDClaim.scala --- Reverse-merging r1125851 into 'rdf.scala.utils': U rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EasyGraph.scala But now I get [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Compilation failure /home/reto/projects/apache/clerezza/trunk/parent/platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java:[75,11] cannot find symbol symbol : variable p location: class org.apache.clerezza.platform.security.UserUtil Could it be that something already depends on the 515 code? Reto
