Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2401 - in development/laboratory/ide/eclipse/plugins: . net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core net.dpml.ide.eclipse.features net.dpml.ide.eclipse.ui net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui net.dpml.ide.eclipse.update

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: peter AT neubauer.se
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2401 - in development/laboratory/ide/eclipse/plugins: . net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core net.dpml.ide.eclipse.features net.dpml.ide.eclipse.ui net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui net.dpml.ide.eclipse.update
  • Date: Mon, 25 Apr 2005 11:58:30 -0400

Author: peter AT neubauer.se
Date: Mon Apr 25 11:58:23 2005
New Revision: 2401

Removed:

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/IndexActionDelegate.java
Modified:
development/laboratory/ide/eclipse/plugins/Developer-README.txt

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/DpmlCorePlugin.java

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/MagicContainer.java

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.features/feature.xml

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/.classpath

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/build.properties

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/plugin.xml

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui/DpmlUiPlugin.java

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui/IndexActionDelegate.java

development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.update/site.xml
Log:
updated readme and more seperating.


Modified: development/laboratory/ide/eclipse/plugins/Developer-README.txt
==============================================================================
--- development/laboratory/ide/eclipse/plugins/Developer-README.txt
(original)
+++ development/laboratory/ide/eclipse/plugins/Developer-README.txt Mon
Apr 25 11:58:23 2005
@@ -66,6 +66,21 @@
deps, be sure to have all plugin projects open when you debug one of
them, otherwise
classes wll not be found.

+How to build the update site
+============================
+
+1. The update site project is located in net.dpml.ide.eclipse.update.
+2. Add/refresh the net.dpml.ide.eclipse.features Feature in the right
version, which in turn
+ referrs to several plugins.
+3. Choose "Build all" in the site.xml GUI "Overview" tab.
+4. This right now does not generate the necessary feature jar in the right
position, so put it into
+ the features dir by issuing:
+ cd net.dpml.ide.eclipse.feature
+ jar -cf
../net.dpml.ide.eclipse.update/features/net.dpml.ide.eclipse_<feature_version>.jar
*
+5. you now should have the necessary plugin jar under the plugins dir and
the feature jar under the features dir.
+6. Deploy the whole structure including the site.xml onto your update server
and you should be able to add that
+ location as an update site.
+
Any questions to dev-dpml AT lists.ibiblio.org.



Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/DpmlCorePlugin.java
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/DpmlCorePlugin.java
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/DpmlCorePlugin.java
Mon Apr 25 11:58:23 2005
@@ -191,7 +191,7 @@
public static void log( String string, int severity )
{
DpmlCorePlugin.getDefault().getLog().log(
- new Status( Status.INFO,
DpmlCorePlugin.getDefault().getClass()
+ new Status( severity, DpmlCorePlugin.getDefault().getClass()
.getName(), 0, string, null ) );

}

Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/MagicContainer.java
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/MagicContainer.java
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core/MagicContainer.java
Mon Apr 25 11:58:23 2005
@@ -93,9 +93,9 @@
public MagicContainer( IJavaProject project, IPath containerPath )
{
m_log = DpmlCorePlugin.getDefault().getLog();
- m_log.log( new Status( Status.INFO, "net.dpml.MagicPlugin", 0,
+ m_log.log( new Status( Status.INFO, getClass().getName(), 0,
"ContainerPath: " + containerPath, null ) );
- m_log.log( new Status( Status.INFO, "net.dpml.MagicPlugin", 0,
+ m_log.log( new Status( Status.INFO, getClass().getName(), 0,
"Project: " + m_reosurceProject, null ) );
this.m_containerPath = containerPath;
if ( !containerPath.segment( 0 ).equals( ID ) )
@@ -104,7 +104,7 @@
}
m_reosurceProject = ResourcesPlugin.getWorkspace().getRoot()
.getProject( project.getElementName() );
- m_log.log( new Status( Status.INFO, "net.dpml.MagicPlugin", 0,
+ m_log.log( new Status( Status.INFO, getClass().getName(), 0,
"Project: " + m_reosurceProject, null ) );
try
{
@@ -116,7 +116,7 @@
m_log
.log( new Status(
Status.ERROR,
- "net.dpml.MagicPlugin",
+ getClass().getName(),
0,
"Could not load index file form the project
prefs. try reloading the magic index again to get it set.",
null ) );
@@ -132,7 +132,7 @@
}
catch ( NullPointerException npe )
{
- m_log.log( new Status( Status.WARNING,
"net.dpml.MagicPlugin",
+ m_log.log( new Status( Status.WARNING, getClass().getName(),
0, "Could not initialize MagicContainer ", npe ) );
}
}

Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.features/feature.xml
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.features/feature.xml
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.features/feature.xml
Mon Apr 25 11:58:23 2005
@@ -1,47 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="net.dpml.ide.eclipse.plugins.Magic"
- label="Magic Eclipse"
- version="0.1.93">
+ id="net.dpml.ide.eclipse"
+ label="DPML Studio"
+ version="0.1.94"
+ provider-name="DPML">

<description url="http://www.dpml.net/magic-eclpse-integration";>
- This enables eclipse to bild a java project using Magic index file as
the source for the creation of source folders and the mounting of dependency
jars as dynamic classpath entries.
+ This is the Collection of plugins that make up the DPML Studio Suite
</description>

<copyright url="http://www.dpml.net";>
- /*
- * Copyright 2005 Peter Neubauer
- *
- * Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
- * 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 &quot;AS IS&quot;
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.
- */
+ Copyright 2005 Peter Neubauer
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+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 &quot;AS
+IS&quot;
+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.
</copyright>

<license url="http://www.dpml.net";>
/*
- * Copyright 2005 Peter Neubauer
- *
- * Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
- * 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 &quot;AS IS&quot;
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.
- */
+* Copyright 2005 Peter Neubauer
+*
+* Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+* 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 &quot;AS IS&quot;
+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.
+*/
</license>

<requires>
@@ -55,12 +57,22 @@
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.debug.core"/>
<import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.help"/>
+ <import plugin="org.eclipse.ant.core"/>
+ <import plugin="org.eclipse.debug.ui"/>
+ <import plugin="org.eclipse.ui.externaltools"/>
</requires>

<plugin
- id="net.dpml.ide.eclipse.plugins.Magic"
- download-size="1500"
- install-size="1500"
- version="0.1.93"/>
+ id="net.dpml.ide.eclipse.core"
+ download-size="0"
+ install-size="0"
+ version="0.1.94"/>
+
+ <plugin
+ id="net.dpml.ide.eclipse.ui"
+ download-size="0"
+ install-size="0"
+ version="0.1.94"/>

</feature>

Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/.classpath
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/.classpath
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/.classpath
Mon Apr 25 11:58:23 2005
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="target/classes/"/>
<classpathentry kind="src" path="src/main">
<attributes>
</attributes>
</classpathentry>
- <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>

Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/build.properties
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/build.properties
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/build.properties
Mon Apr 25 11:58:23 2005
@@ -3,7 +3,8 @@
lib/,\
META-INF/,\
help/,\
- lib/dpmlui.jar,\
- target/classes/
-jars.compile.order = lib/dpmlui.jar
-source.lib/dpmlui.jar = target/classes/
+ target/classes/,\
+ dpmlui.jar,\
+ bin/
+jars.compile.order = dpmlui.jar
+source.dpmlui.jar = bin/

Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/plugin.xml
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/plugin.xml
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/plugin.xml
Mon Apr 25 11:58:23 2005
@@ -7,9 +7,6 @@
provider-name="DPML"
class="net.dpml.ide.eclipse.ui.DpmlUiPlugin">
<runtime>
- <library name="lib/dpmlui.jar">
- <export name="*"/>
- </library>
<library name="lib/dpml-ide-common-magic-SNAPSHOT.jar">
<export name="*"/>
</library>
@@ -25,6 +22,9 @@
<library name="lib/dpml-transit-tools-SNAPSHOT.jar">
<export name="*"/>
</library>
+ <library name="dpmlui.jar">
+ <export name="*"/>
+ </library>
</runtime>

<requires>

Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui/DpmlUiPlugin.java
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui/DpmlUiPlugin.java
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui/DpmlUiPlugin.java
Mon Apr 25 11:58:23 2005
@@ -1,20 +1,13 @@
package net.dpml.ide.eclipse.ui;

-import java.util.Hashtable;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.ant.internal.core.AntClasspathEntry;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.IStartup;
import org.osgi.framework.BundleContext;
-import org.osgi.service.url.URLConstants;
-import org.osgi.service.url.URLStreamHandlerService;

/**
* The main plugin class to be used in the desktop.
@@ -31,15 +24,6 @@
*/
private ResourceBundle m_resourceBundle;

- /**
- * number of entries we need for the DPML libs
- */
- private static final int MAGIC_ENTRIES_LENGTH = 3;
-
- /**
- * the prefix for plugin search path
- */
- private static final int UPDATE_PREFIX_LENGTH = 7;

/**
* The constructor.
@@ -57,72 +41,10 @@
public void start( BundleContext context ) throws Exception
{
super.start( context );
- //registerArtifactHandler( context );

- fixAntClasspath();
}

- /**
- * add the Transit libs to the root ant classpath for the eclipse ant
plugin
- * in order to get it understand transit ant tasks
- *
- */
- private void fixAntClasspath()
- {
- IAntClasspathEntry[] transitClasspath = new
IAntClasspathEntry[MAGIC_ENTRIES_LENGTH];
- AntCorePreferences prefs =
AntCorePlugin.getPlugin().getPreferences();
- IAntClasspathEntry[] coreClasspath =
prefs.getDefaultAntHomeEntries();
- IAntClasspathEntry[] newClasspath;
- String pluginPath =
DpmlUiPlugin.getDefault().getBundle().getLocation()
- .substring( UPDATE_PREFIX_LENGTH );
- try
- {
- transitClasspath[0] = new AntClasspathEntry( pluginPath
- + "lib/dpml-transit-main-SNAPSHOT.jar" );
- transitClasspath[1] = new AntClasspathEntry( pluginPath
- + "lib/dpml-transit-tools.jar" );
- transitClasspath[2] = new AntClasspathEntry( pluginPath
- + "lib/junit-3.8.1.jar" );
- }
- catch ( Exception e )
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- newClasspath = new AntClasspathEntry[coreClasspath.length
- + transitClasspath.length];
- System.arraycopy( coreClasspath, 0, newClasspath, 0,
- coreClasspath.length );
- System.arraycopy( transitClasspath, 0, newClasspath,
- coreClasspath.length, transitClasspath.length );
- prefs.setAntHomeClasspathEntries( newClasspath );
- }
-
- /**
- * Register the artifact URL support as a service to the URLHandler
service
- *
- * @param context
- * the context to register in
- */
- private void registerArtifactHandler( BundleContext context )
- {
- Hashtable properties = new Hashtable( 1 );
- properties.put( URLConstants.URL_HANDLER_PROTOCOL,
- new String[]{ArtifactURLHandler.PROTOCOL} );
- try
- {
- context.registerService(
URLStreamHandlerService.class.getName(),
- new ArtifactURLHandler(), properties
);
-
-
- }
- catch ( Exception e )
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
+

/**
*
@@ -191,7 +113,7 @@
public static void log( String string, int severity )
{
DpmlUiPlugin.getDefault().getLog().log(
- new Status( Status.INFO, DpmlUiPlugin.getDefault().getClass()
+ new Status( severity, DpmlUiPlugin.getDefault().getClass()
.getName(), 0, string, null ) );

}

Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui/IndexActionDelegate.java
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui/IndexActionDelegate.java
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui/IndexActionDelegate.java
Mon Apr 25 11:58:23 2005
@@ -90,7 +90,7 @@
}
catch ( BackingStoreException e )
{
- log.log( new Status( Status.WARNING, "net.dpml.MagicPlugin",
0,
+ log.log( new Status( Status.WARNING, getClass().getName(), 0,
"Could not store new index" +
mIndexFile.getProjectRelativePath(), e ) );
}
}
@@ -108,7 +108,7 @@
}
catch ( NullPointerException npe )
{
- log.log( new Status( Status.WARNING, "net.dpml.MagicPlugin", 0,
+ log.log( new Status( Status.WARNING, getClass().getName(), 0,
"Could not initialize MagicContainer ", npe ) );
}

@@ -173,7 +173,7 @@
}
catch ( CoreException e1 )
{
- log.log( new Status( Status.ERROR, "net.dpml.MagicPlugin", 0,
+ log.log( new Status( Status.ERROR, getClass().getName(), 0,
"Could not initialize MagicContainer 0", e1 ) );
}// = proj;
try
@@ -182,7 +182,7 @@
}
catch ( JavaModelException e )
{
- log.log( new Status( Status.ERROR, "net.dpml.MagicPlugin", 0,
+ log.log( new Status( Status.ERROR, getClass().getName(), 0,
"Could not initialize MagicContainer 1", e ) );
}
}

Modified:
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.update/site.xml
==============================================================================
---
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.update/site.xml
(original)
+++
development/laboratory/ide/eclipse/plugins/net.dpml.ide.eclipse.update/site.xml
Mon Apr 25 11:58:23 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/net.dpml.ide.eclipse.plugins.Magic_0.1.93.jar"
id="net.dpml.ide.eclipse.plugins.Magic" version="0.1.93">
+ <feature url="features/net.dpml.ide.eclipse_0.1.94.jar"
id="net.dpml.ide.eclipse" version="0.1.94">
<category name="DPML"/>
</feature>
- <category-def name="DPML" label="DPML Eclipse Plugins"/>
+ <category-def name="DPML" label="DPML Studio Eclipse Plugins"/>
</site>



  • svn commit: r2401 - in development/laboratory/ide/eclipse/plugins: . net.dpml.ide.eclipse.core/src/net/dpml/ide/eclipse/core net.dpml.ide.eclipse.features net.dpml.ide.eclipse.ui net.dpml.ide.eclipse.ui/src/main/net/dpml/ide/eclipse/ui net.dpml.ide.eclipse.update, peter, 04/25/2005

Archive powered by MHonArc 2.6.24.

Top of Page