directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1650910 - in /directory/studio/branches/studio-tycho/plugins: ./ rcp/ rcp/src/main/java/org/apache/directory/studio/actions/
Date Sun, 11 Jan 2015 16:12:28 GMT
Author: seelmann
Date: Sun Jan 11 16:12:28 2015
New Revision: 1650910

URL: http://svn.apache.org/r1650910
Log:
Migrated rcp plugin, not fully functional but build works. Removed update code.

Added:
    directory/studio/branches/studio-tycho/plugins/rcp/build.properties
    directory/studio/branches/studio-tycho/plugins/rcp/plugin_customization.ini
    directory/studio/branches/studio-tycho/plugins/rcp/pom-first.xml
Modified:
    directory/studio/branches/studio-tycho/plugins/pom-first.xml
    directory/studio/branches/studio-tycho/plugins/pom.xml
    directory/studio/branches/studio-tycho/plugins/rcp/plugin.properties
    directory/studio/branches/studio-tycho/plugins/rcp/plugin_de.properties
    directory/studio/branches/studio-tycho/plugins/rcp/plugin_fr.properties
    directory/studio/branches/studio-tycho/plugins/rcp/pom.xml
    directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java
    directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java
    directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java

Modified: directory/studio/branches/studio-tycho/plugins/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/pom-first.xml?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/pom-first.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/pom-first.xml Sun Jan 11 16:12:28 2015
@@ -54,6 +54,7 @@
     <!-- module>ldapservers.apacheds.v156/pom-first.xml</module -->
     <!-- module>ldapservers.apacheds.v157/pom-first.xml</module -->
     <module>ldapservers.apacheds.v200/pom-first.xml</module>
+    <module>rcp/pom-first.xml</module>
   </modules>
 
   <build>

Modified: directory/studio/branches/studio-tycho/plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/pom.xml?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/pom.xml Sun Jan 11 16:12:28 2015
@@ -52,7 +52,7 @@
     <module>ldapservers.apacheds.v200</module>
     <module>ldifeditor</module>
     <module>ldifparser</module>
-<!--     <module>rcp</module> -->
+    <module>rcp</module>
      <module>schemaeditor</module>
      <module>valueeditors</module>
   </modules>

Added: directory/studio/branches/studio-tycho/plugins/rcp/build.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/build.properties?rev=1650910&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/build.properties (added)
+++ directory/studio/branches/studio-tycho/plugins/rcp/build.properties Sun Jan 11 16:12:28
2015
@@ -0,0 +1,10 @@
+bin.includes = META-INF/,\
+               .,\
+               about.ini,\
+               plugin.properties,\
+               studio.png,\
+               resources/,\
+               plugin_de.properties,\
+               plugin_fr.properties,\
+               plugin_customization.ini
+source.. = src/main/java/

Modified: directory/studio/branches/studio-tycho/plugins/rcp/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/plugin.properties?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/plugin.properties (original)
+++ directory/studio/branches/studio-tycho/plugins/rcp/plugin.properties Sun Jan 11 16:12:28
2015
@@ -14,7 +14,7 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-aboutText=Apache Directory Studio\n\n\Version: ${pom.version}\n\n\u00A9 2006-2013 Apache
Software Foundation - All right reserved.\n\Visit http://directory.apache.org/studio\n\n\This
product is licensed under the terms of the Apache License 2.0.\n\n\Some icons from FAMFAMFAM
http://www.famfamfam.com/lab/icons/silk
+aboutText=Apache Directory Studio\n\n\Version: 2.0.0\n\n\u00A9 2006-2013 Apache Software
Foundation - All right reserved.\n\Visit http://directory.apache.org/studio\n\n\This product
is licensed under the terms of the Apache License 2.0.\n\n\Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
 
 Action_AddExtension_id=org.apache.directory.studio.newExtensions
 Action_ManageConfiguration_id=org.apache.directory.studio.manageConfiguration

Added: directory/studio/branches/studio-tycho/plugins/rcp/plugin_customization.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/plugin_customization.ini?rev=1650910&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/plugin_customization.ini (added)
+++ directory/studio/branches/studio-tycho/plugins/rcp/plugin_customization.ini Sun Jan 11
16:12:28 2015
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
+org.eclipse.ui/DOCK_PERSPECTIVE_BAR=right
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
\ No newline at end of file

Modified: directory/studio/branches/studio-tycho/plugins/rcp/plugin_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/plugin_de.properties?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/plugin_de.properties (original)
+++ directory/studio/branches/studio-tycho/plugins/rcp/plugin_de.properties Sun Jan 11 16:12:28
2015
@@ -14,5 +14,5 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-aboutText=Apache Directory Studio\n\n\Version: ${pom.version}\n\n\u00A9 2006-2013 Apache
Software Foundation - Alle Rechte vorbehalten.\n\Besuchen Sie http://directory.apache.org/studio\n\n\Dieses
Produkt wird unter den Bedingungen der Apache License 2.0 lizenziert.\n\n\Einige Symbole stammen
von FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+aboutText=Apache Directory Studio\n\n\Version: 2.0.0\n\n\u00A9 2006-2013 Apache Software
Foundation - Alle Rechte vorbehalten.\n\Besuchen Sie http://directory.apache.org/studio\n\n\Dieses
Produkt wird unter den Bedingungen der Apache License 2.0 lizenziert.\n\n\Einige Symbole stammen
von FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
 PrefPage_ShutdownPreferencesPage_name=Beenden

Modified: directory/studio/branches/studio-tycho/plugins/rcp/plugin_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/plugin_fr.properties?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/plugin_fr.properties (original)
+++ directory/studio/branches/studio-tycho/plugins/rcp/plugin_fr.properties Sun Jan 11 16:12:28
2015
@@ -14,5 +14,5 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-aboutText=Apache Directory Studio\n\n\Version: ${pom.version}\n\n\u00A9 2006-2013 Apache
Software Foundation - Tous droits réservés.\n\Visit http://directory.apache.org/studio\n\n\Ce
produit est licencié selon les termes de la Apache License 2.0.\n\n\Certaines icones sont
de FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+aboutText=Apache Directory Studio\n\n\Version: 2.0.0\n\n\u00A9 2006-2013 Apache Software
Foundation - Tous droits réservés.\n\Visit http://directory.apache.org/studio\n\n\Ce produit
est licencié selon les termes de la Apache License 2.0.\n\n\Certaines icones sont de FAMFAMFAM
http://www.famfamfam.com/lab/icons/silk
 PrefPage_ShutdownPreferencesPage_name=Extinction

Added: directory/studio/branches/studio-tycho/plugins/rcp/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/pom-first.xml?rev=1650910&view=auto
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/pom-first.xml (added)
+++ directory/studio/branches/studio-tycho/plugins/rcp/pom-first.xml Sun Jan 11 16:12:28 2015
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent-plugins</artifactId>
+    <version>2.0.0.qualifier</version>
+    <relativePath>../pom-first.xml</relativePath>
+  </parent>
+
+  <artifactId>org.apache.directory.studio.rcp</artifactId>
+  <name>Apache Directory Studio RCP Manifest Generation</name>
+  <description/>
+  <packaging>bundle</packaging>
+
+  <build>
+     <!-- MANIFEST.MF Generation -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
+            <Bundle-Localization>plugin</Bundle-Localization>
+            <Eclipse-LazyStart>true</Eclipse-LazyStart>
+            <Bundle-Activator>org.apache.directory.studio.Activator</Bundle-Activator>
+            <Export-Package>!*</Export-Package>
+            <Import-Package/>
+            
+<!--  org.eclipse.update.core, -->
+<!--  org.eclipse.update.ui, -->
+            <Require-Bundle>org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.ui.intro,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.net</Require-Bundle>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
+

Modified: directory/studio/branches/studio-tycho/plugins/rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/pom.xml?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/pom.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/rcp/pom.xml Sun Jan 11 16:12:28 2015
@@ -24,259 +24,41 @@
     <groupId>org.apache.directory.studio</groupId>
     <artifactId>parent-plugins</artifactId>
     <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
   
-  <artifactId>rcp</artifactId>
+  <artifactId>org.apache.directory.studio.rcp</artifactId>
   <name>Apache Directory Studio RCP</name>
-  <packaging>jar</packaging>
+  <packaging>eclipse-plugin</packaging>
 
   <description />
   
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>plugin.properties</include>
-          <include>plugin.xml</include>
-          <include>about.ini</include>
-          <include>studio.png</include>
-        </includes>
-        <filtering>true</filtering>
-      </resource>
-      <resource>
-        <directory>resources</directory>
-        <targetPath>resources</targetPath>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>src/main/java</directory>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-          <pde>true</pde>
-          <projectnatures>
-            <projectnature>org.eclipse.jem.workbench.JavaEMFNature</projectnature>
-            <projectnature>org.eclipse.pde.PluginNature</projectnature>
-            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
-            <projectnature>org.eclipse.jem.beaninfo.BeanInfoNature</projectnature>
-          </projectnatures>
-          <classpathContainers>
-            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
-            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
-          </classpathContainers>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>studio-maven-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-          <createManifest>true</createManifest>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>prepare-jar-package</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-     <!-- MANIFEST.MF Generation -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
-            <Eclipse-LazyStart>true</Eclipse-LazyStart>
-            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
-            <Embed-Directory>lib</Embed-Directory>
-            <Embed-StripGroup>true</Embed-StripGroup>
-            <Embed-Transitive>true</Embed-Transitive>
-            <Bundle-Activator>org.apache.directory.studio.Activator</Bundle-Activator>
-            <Require-Bundle>org.eclipse.core.runtime,
- org.eclipse.update.core,
- org.eclipse.update.ui,
- org.eclipse.ui,
- org.eclipse.ui.intro,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.core.filesystem,
- org.eclipse.core.net
-            </Require-Bundle>
-            <Export-Package>!*</Export-Package>
-            <Import-Package>!*</Import-Package>
-          </instructions>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- No tests to run -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludeSubProjects>false</excludeSubProjects>
-            <excludes>
-              <!-- MAVEN_DEFAULT_EXCLUDES -->
-              <exclude>**/target/**/*</exclude>
-              <exclude>**/cobertura.ser</exclude>
-              <!-- ECLIPSE_DEFAULT_EXCLUDES -->
-              <exclude>**/.classpath</exclude>
-              <exclude>**/.project</exclude>
-              <exclude>**/.settings/**/*</exclude>
-              <!-- IDEA_DEFAULT_EXCLUDES -->
-              <exclude>**/*.iml</exclude>
-              <exclude>**/*.ipr</exclude>
-              <exclude>**/*.iws</exclude>
-              <!-- MANIFEST_MF_EXCLUDES -->
-              <exclude>**/MANIFEST.MF</exclude>
-              <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48
-->
-              <exclude>**/dependency-reduced-pom.xml</exclude>
-              <!-- GITIGNORE_EXCLUDES -->
-              <exclude>**/.gitignore</exclude>
-              <!-- ABOUT_EXCLUDES -->
-              <exclude>**/about.ini</exclude>
-              <exclude>**/about_files/*</exclude>
-              <!-- LOG_FILES_EXCLUDES -->
-              <exclude>**/*.log</exclude>
-              <exclude>**/*.vm</exclude>
-              <!-- OTHER_EXCLUDES -->
-              <exclude>resources/icons/linux/studio.xpm</exclude>
-            </excludes>
-          </configuration>
-         </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.swt.gtk.linux</groupId>
-      <artifactId>x86</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>preferences</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>jface</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ui</groupId>
-      <artifactId>workbench</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>runtime</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>commands</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>jobs</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse</groupId>
-      <artifactId>osgi</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.update</groupId>
-      <artifactId>core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.update</groupId>
-      <artifactId>ui</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.ui</groupId>
-      <artifactId>ide</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>resources</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>filesystem</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.core</groupId>
-      <artifactId>net</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox</groupId>
-      <artifactId>app</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
+<!--   <build> -->
+<!--     <resources> -->
+<!--       <resource> -->
+<!--         <directory>.</directory> -->
+<!--         <includes> -->
+<!--           <include>plugin.properties</include> -->
+<!--           <include>plugin.xml</include> -->
+<!--           <include>about.ini</include> -->
+<!--           <include>studio.png</include> -->
+<!--         </includes> -->
+<!--         <filtering>true</filtering> -->
+<!--       </resource> -->
+<!--       <resource> -->
+<!--         <directory>resources</directory> -->
+<!--         <targetPath>resources</targetPath> -->
+<!--       </resource> -->
+<!--       <resource> -->
+<!--         <directory>src/main/resources</directory> -->
+<!--       </resource> -->
+<!--       <resource> -->
+<!--         <directory>src/main/java</directory> -->
+<!--         <includes> -->
+<!--           <include>**/*.properties</include> -->
+<!--         </includes> -->
+<!--       </resource> -->
+<!--     </resources> -->
+<!--   </build> -->
 
 </project>

Modified: directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java
(original)
+++ directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java
Sun Jan 11 16:12:28 2015
@@ -30,12 +30,12 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.update.search.BackLevelFilter;
-import org.eclipse.update.search.EnvironmentFilter;
-import org.eclipse.update.search.UpdateSearchRequest;
-import org.eclipse.update.search.UpdateSearchScope;
-import org.eclipse.update.ui.UpdateJob;
-import org.eclipse.update.ui.UpdateManagerUI;
+//import org.eclipse.update.search.BackLevelFilter;
+//import org.eclipse.update.search.EnvironmentFilter;
+//import org.eclipse.update.search.UpdateSearchRequest;
+//import org.eclipse.update.search.UpdateSearchScope;
+//import org.eclipse.update.ui.UpdateJob;
+//import org.eclipse.update.ui.UpdateManagerUI;
 
 
 /**
@@ -73,35 +73,35 @@ public class AddExtensionAction extends
         {
             public void run()
             {
-                UpdateJob job = new UpdateJob(
-                    Messages.getString( "AddExtensionAction.Searching_new_extensions" ),
getSearchRequest() ); //$NON-NLS-1$
-                UpdateManagerUI.openInstaller( window.getShell(), job );
+//                UpdateJob job = new UpdateJob(
+//                    Messages.getString( "AddExtensionAction.Searching_new_extensions" ),
getSearchRequest() ); //$NON-NLS-1$
+//                UpdateManagerUI.openInstaller( window.getShell(), job );
             }
 
 
-            private UpdateSearchRequest getSearchRequest()
-            {
-                UpdateSearchRequest result = new UpdateSearchRequest( UpdateSearchRequest
-                    .createDefaultSiteSearchCategory(), new UpdateSearchScope() );
-                result.addFilter( new BackLevelFilter() );
-                result.addFilter( new EnvironmentFilter() );
-                UpdateSearchScope scope = new UpdateSearchScope();
-                try
-                {
-                    String homeBase = System
-                        .getProperty(
-                            "studio.homebase", Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Home_Base"
) ); //$NON-NLS-1$ //$NON-NLS-2$
-                    URL url = new URL( homeBase );
-                    scope.addSearchSite(
-                        Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Site"
), url, null ); //$NON-NLS-1$
-                }
-                catch ( MalformedURLException e )
-                {
-                    // TODO: handle exception
-                }
-                result.setScope( scope );
-                return result;
-            }
+//            private UpdateSearchRequest getSearchRequest()
+//            {
+//                UpdateSearchRequest result = new UpdateSearchRequest( UpdateSearchRequest
+//                    .createDefaultSiteSearchCategory(), new UpdateSearchScope() );
+//                result.addFilter( new BackLevelFilter() );
+//                result.addFilter( new EnvironmentFilter() );
+//                UpdateSearchScope scope = new UpdateSearchScope();
+//                try
+//                {
+//                    String homeBase = System
+//                        .getProperty(
+//                            "studio.homebase", Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Home_Base"
) ); //$NON-NLS-1$ //$NON-NLS-2$
+//                    URL url = new URL( homeBase );
+//                    scope.addSearchSite(
+//                        Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Site"
), url, null ); //$NON-NLS-1$
+//                }
+//                catch ( MalformedURLException e )
+//                {
+//                    // TODO: handle exception
+//                }
+//                result.setScope( scope );
+//                return result;
+//            }
         } );
     }
 }
\ No newline at end of file

Modified: directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java
(original)
+++ directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java
Sun Jan 11 16:12:28 2015
@@ -27,7 +27,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.update.ui.UpdateManagerUI;
+//import org.eclipse.update.ui.UpdateManagerUI;
 
 
 /**
@@ -65,7 +65,7 @@ public class ManageConfigurationAction e
         {
             public void run()
             {
-                UpdateManagerUI.openConfigurationManager( window.getShell() );
+//                UpdateManagerUI.openConfigurationManager( window.getShell() );
             }
         } );
     }

Modified: directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java?rev=1650910&r1=1650909&r2=1650910&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java
(original)
+++ directory/studio/branches/studio-tycho/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java
Sun Jan 11 16:12:28 2015
@@ -27,8 +27,8 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.update.ui.UpdateJob;
-import org.eclipse.update.ui.UpdateManagerUI;
+//import org.eclipse.update.ui.UpdateJob;
+//import org.eclipse.update.ui.UpdateManagerUI;
 
 
 /**
@@ -66,8 +66,8 @@ public class UpdateAction extends Action
         {
             public void run()
             {
-                UpdateJob job = new UpdateJob( Messages.getString( "UpdateAction.Searching_for_updates"
), false, false ); //$NON-NLS-1$
-                UpdateManagerUI.openInstaller( window.getShell(), job );
+//                UpdateJob job = new UpdateJob( Messages.getString( "UpdateAction.Searching_for_updates"
), false, false ); //$NON-NLS-1$
+//                UpdateManagerUI.openInstaller( window.getShell(), job );
             }
         } );
     }



Mime
View raw message