Adapt to Commons 2.x and some subtle comments cleaning.

git-svn-id: https://svn.argeo.org/slc/trunk@7970 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
index df2e07a1e99c93a11ebe076fc56bedf27431824e..a9eb9af744fa54892ac35f93376e0a9df54a8aa3 100644 (file)
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
@@ -21,8 +21,8 @@
        <bean id="registerRepository"
                class="org.argeo.slc.client.ui.dist.commands.RegisterRepository">
                <property name="repositoryFactory" ref="repositoryFactory" />
-               <property name="nodeRepository" ref="nodeRepository" />
                <property name="keyring" ref="keyring" />
+               <property name="nodeRepository" ref="nodeRepository" />
        </bean>
 
        <bean id="unregisterRemoteRepo"
@@ -61,16 +61,17 @@
 
        <bean id="publishWorkspace" class="org.argeo.slc.client.ui.dist.commands.PublishWorkspace">
                <property name="repositoryFactory" ref="repositoryFactory" />
-               <property name="nodeRepository" ref="nodeRepository" />
                <property name="keyring" ref="keyring" />
+               <property name="nodeRepository" ref="nodeRepository" />
        </bean>
 
        <bean id="normalizeWorkspace"
                class="org.argeo.slc.client.ui.dist.commands.NormalizeWorkspace">
                <property name="repositoryFactory" ref="repositoryFactory" />
-               <property name="nodeRepository" ref="nodeRepository" />
                <property name="keyring" ref="keyring" />
+               <property name="nodeRepository" ref="nodeRepository" />
        </bean>
+
        <bean id="openGenerateBinariesWizard"
                class="org.argeo.slc.client.ui.dist.commands.OpenGenerateBinariesWizard">
                <property name="repoService" ref="repoService" />
@@ -79,14 +80,14 @@
        <!-- WORKSPACE CRUD -->
        <bean id="createWorkspace" class="org.argeo.slc.client.ui.dist.commands.CreateWorkspace">
                <property name="repositoryFactory" ref="repositoryFactory" />
-               <property name="nodeRepository" ref="nodeRepository" />
                <property name="keyring" ref="keyring" />
+               <property name="nodeRepository" ref="nodeRepository" />
        </bean>
 
        <bean id="copyWorkspace" class="org.argeo.slc.client.ui.dist.commands.CopyWorkspace">
                <property name="repositoryFactory" ref="repositoryFactory" />
-               <property name="nodeRepository" ref="nodeRepository" />
                <property name="keyring" ref="keyring" />
+               <property name="nodeRepository" ref="nodeRepository" />
        </bean>
 
        <bean id="copyLocalJavaWorkspace"
@@ -104,17 +105,16 @@
                </property>
        </bean>
 
-
        <bean id="mergeWorkspaces" class="org.argeo.slc.client.ui.dist.commands.MergeWorkspaces">
                <property name="repositoryFactory" ref="repositoryFactory" />
-               <property name="nodeRepository" ref="nodeRepository" />
                <property name="keyring" ref="keyring" />
+               <property name="nodeRepository" ref="nodeRepository" />
        </bean>
 
        <bean id="deleteWorkspace" class="org.argeo.slc.client.ui.dist.commands.DeleteWorkspace">
                <property name="repositoryFactory" ref="repositoryFactory" />
-               <property name="nodeRepository" ref="nodeRepository" />
                <property name="keyring" ref="keyring" />
+               <property name="nodeRepository" ref="nodeRepository" />
        </bean>
 
        <!-- ADVANCED -->
@@ -123,7 +123,6 @@
                <property name="repository" ref="javaRepository" />
        </bean>
 
-
        <!-- LEGACY -->
        <!-- <bean id="org.argeo.slc.client.ui.dist.openGenericJcrQueryEditor" class="org.argeo.eclipse.ui.jcr.commands.OpenGenericJcrQueryEditor" 
                scope="prototype"> <property name="editorId" value="org.argeo.slc.client.ui.dist.genericJcrQueryEditor" 

diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml
index fce4930c8ad0551a3370a48368673c47178a6bd9..9d7d5579fe83de013e9a83bab45412429cb771fa 100644 (file)
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml
@@ -5,7 +5,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-       <!--  LEGACY -->
+       <!-- LEGACY -->
        <!-- <bean id="org.argeo.slc.client.ui.dist.genericJcrQueryEditor" class="org.argeo.eclipse.ui.jcr.editors.GenericJcrQueryEditor" 
                scope="prototype"> <property name="session" ref="slcSession" /> </bean> -->
                
@@ -28,4 +28,4 @@
                scope="prototype">
                <property name="repoService" ref="repoService" />
        </bean>
-</beans>
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
index b5413793e116f30d7dfd48251518ed7dd19be658..9bde05fc13971abb8aca824a0c6c4c1039c69132 100644 (file)
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
@@ -18,4 +18,4 @@
 
        <!-- For the record <property name="session"> <bean factory-bean="repository" 
                factory-method="login" /> </property> -->
-</beans>
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/views.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/views.xml
index e18ed1137907c2b8f4e7dde53e319c7370297442..7089965b6967d126893ce5542a97f2ab9fcbd92e 100644 (file)
--- a/org.argeo.slc.client.ui.dist/META-INF/spring/views.xml
+++ b/org.argeo.slc.client.ui.dist/META-INF/spring/views.xml
@@ -76,4 +76,4 @@
        <!-- <bean id="distributionPerspective" class="org.argeo.slc.client.ui.dist.DistributionPerspective" 
                scope="prototype"> <property name="repositoryFactory" ref="repositoryFactory" 
                /> <property name="nodeRepository" ref="nodeRepository" /> </bean> -->
-</beans>
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
index aab7f06f16b10223126bac972f268c048461f56f..6eea82f3f3036dc2fac7e18f01a760dcdc493e37 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java
@@ -39,7 +39,7 @@ public class DistTreeContentProvider implements ITreeContentProvider {
        // Context
        private Session nodeSession;
        List<RepoElem> repositories = new ArrayList<RepoElem>();
-       
+
        public Object[] getElements(Object input) {
                Repository nodeRepository = (Repository) input;
                try {
@@ -105,7 +105,6 @@ public class DistTreeContentProvider implements ITreeContentProvider {
 
        private void initializeModel(Session nodeSession) {
                try {
-
                        Node homeNode = UserJcrUtils.getUserHome(nodeSession);
                        if (homeNode == null) // anonymous
                                throw new SlcException("User must be authenticated.");
@@ -113,7 +112,8 @@ public class DistTreeContentProvider implements ITreeContentProvider {
                        // make sure base directory is available
                        Node repos = JcrUtils.mkdirs(nodeSession, homeNode.getPath()
                                        + RepoConstants.REPOSITORIES_BASE_PATH);
-                       nodeSession.save();
+                       if (nodeSession.hasPendingChanges())
+                               nodeSession.save();
 
                        // register default local java repository
                        String alias = RepoConstants.DEFAULT_JAVA_REPOSITORY_ALIAS;

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java
index 908ce05ad51b43b807222aeebf7253182b9fd46c..8948bccfd711e078c92e68a66fc71b04d60ffa4a 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java
@@ -101,7 +101,6 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
                viewer.setContentProvider(treeContentProvider);
                viewer.addDoubleClickListener(new DistTreeDoubleClickListener(viewer));
                viewer.setComparer(new DistTreeComparer());
-
                viewer.setComparator(new DistTreeComparator());
 
                @SuppressWarnings("unused")
@@ -374,9 +373,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
                viewer.expandToLevel(2);
        }
 
-       /*
-        * DEPENDENCY INJECTION
-        */
+       /* DEPENDENCY INJECTION */
        public void setNodeRepository(Repository nodeRepository) {
                this.nodeRepository = nodeRepository;
        }