Adapt to changes in Argeo Commons.
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 20 Mar 2020 06:38:34 +0000 (07:38 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 20 Mar 2020 06:38:34 +0000 (07:38 +0100)
org.argeo.slc.client.rap/META-INF/spring/osgi.xml
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java

index 149c7a2bd504ad096bbbc5dd8ddd10e4f023a528..6c765462090bbcdb66ee2550c48763c0e5aa2521 100644 (file)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+<beans:beans\r
+       xmlns="http://www.springframework.org/schema/osgi"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xmlns:beans="http://www.springframework.org/schema/beans"\r
        xmlns:osgi="http://www.springframework.org/schema/osgi"\r
        xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
        http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
 \r
        <beans:description>SLC UI RAP</beans:description>\r
 \r
-       <reference id="nodeRepository" interface="javax.jcr.Repository"\r
-               filter="(cn=node)" />\r
-       <reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
-       <reference id="keyring" interface="org.argeo.api.security.CryptoKeyring" />\r
+       <reference id="nodeRepository"\r
+       interface="javax.jcr.Repository" />\r
+       <reference id="repositoryFactory"\r
+               interface="javax.jcr.RepositoryFactory" />\r
+       <reference id="keyring"\r
+               interface="org.argeo.api.security.CryptoKeyring" />\r
 </beans:beans>\r
index ecf7adeb9ed571bf5c4c56108d4dd50e9d579bd0..e228dcd43c23eb86eddad0ed6cdfedb352efc1fd 100644 (file)
@@ -33,6 +33,7 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;\r
 import javax.jcr.observation.ObservationManager;\r
 \r
+import org.argeo.api.NodeConstants;\r
 import org.argeo.cms.ui.workbench.util.CommandUtils;\r
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;\r
 import org.argeo.jcr.JcrUtils;\r
@@ -139,7 +140,7 @@ public class JcrResultTreeView extends ViewPart {
        @Override\r
        public void createPartControl(Composite parent) {\r
                try {\r
-                       session = repository.login();\r
+                       session = repository.login(NodeConstants.HOME);\r
                } catch (RepositoryException e1) {\r
                        throw new SlcException("Cannot log in to repository");\r
                }\r