Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2002 - in development/laboratory/ide/eclipse/magic: features plugin plugin/help plugin/help/html/tasks plugin/lib plugin/resources plugin/src/net/dpml/ide/eclipse/plugins/magic update

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2002 - in development/laboratory/ide/eclipse/magic: features plugin plugin/help plugin/help/html/tasks plugin/lib plugin/resources plugin/src/net/dpml/ide/eclipse/plugins/magic update

Chronological Thread  
    < Chronological >       < Thread >
  • From: peter AT neubauer.se
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2002 - in development/laboratory/ide/eclipse/magic: features plugin plugin/help plugin/help/html/tasks plugin/lib plugin/resources plugin/src/net/dpml/ide/eclipse/plugins/magic update
  • Date: Thu, 10 Mar 2005 03:55:23 -0500
Author: peter AT neubauer.se
Date: Thu Mar 10 03:55:22 2005
New Revision: 2002

Added:

development/laboratory/ide/eclipse/magic/plugin/help/html/tasks/compiling.html
development/laboratory/ide/eclipse/magic/plugin/lib/junit-3.8.1.jar
(contents, props changed)

development/laboratory/ide/eclipse/magic/plugin/resources/after-rebuild.png
(contents, props changed)
development/laboratory/ide/eclipse/magic/plugin/resources/ant-build1.png
(contents, props changed)
development/laboratory/ide/eclipse/magic/plugin/resources/ant-build2.png
(contents, props changed)

development/laboratory/ide/eclipse/magic/plugin/resources/rebuild-index.png
(contents, props changed)
Modified:
development/laboratory/ide/eclipse/magic/features/feature.xml
development/laboratory/ide/eclipse/magic/plugin/build.properties

development/laboratory/ide/eclipse/magic/plugin/help/html/tasks/rebuilding.html
development/laboratory/ide/eclipse/magic/plugin/help/toc_Tasks.xml
development/laboratory/ide/eclipse/magic/plugin/plugin.xml

development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java

development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
development/laboratory/ide/eclipse/magic/update/site.xml
Log:
-fixed a file/container bug
-added screenshots to help


Modified: development/laboratory/ide/eclipse/magic/features/feature.xml
==============================================================================
--- development/laboratory/ide/eclipse/magic/features/feature.xml
(original)
+++ development/laboratory/ide/eclipse/magic/features/feature.xml Thu
Mar 10 03:55:22 2005
@@ -2,7 +2,7 @@
<feature
id="net.dpml.ide.eclipse.Magic"
label="magic-eclipse-feature"
- version="0.1.6">
+ version="0.1.91">

<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.
@@ -65,6 +65,6 @@
id="net.dpml.ide.eclipse.plugins.Magic"
download-size="0"
install-size="0"
- version="0.1.6"/>
+ version="0.1.91"/>

</feature>

Modified: development/laboratory/ide/eclipse/magic/plugin/build.properties
==============================================================================
--- development/laboratory/ide/eclipse/magic/plugin/build.properties
(original)
+++ development/laboratory/ide/eclipse/magic/plugin/build.properties Thu
Mar 10 03:55:22 2005
@@ -3,12 +3,8 @@
bin.includes = plugin.xml,\
TransitPlugin.jar,\
resources/,\
- lib/dpml-ide-common-magic-SNAPSHOT.jar,\
- lib/dpml-transit-main.jar,\
- lib/dpml-transit-tools.jar,\
+ lib/,\
bin/,\
- lib/ant-1.6.2.jar,\
- lib/dpml-magic-core-SNAPSHOT.jar,\
META-INF/,\
help/
jars.compile.order = TransitPlugin.jar

Added:
development/laboratory/ide/eclipse/magic/plugin/help/html/tasks/compiling.html
==============================================================================
--- (empty file)
+++
development/laboratory/ide/eclipse/magic/plugin/help/html/tasks/compiling.html
Thu Mar 10 03:55:22 2005
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="Content-Type"
+ content="text/html; charset=iso-8859-1">
+ <title>Compiling the default target via Eclipse ant support</title>
+</head>
+<body>
+<h1>Compiling the default target via Eclipse ant support</h1>
+In the navigation panel (Navigator or Package Explorer), navigate to an
+build.xml<br>
+<br>
+Right-click on the build.xml file and you should see e Popup-Entry
+"Run as ..."<br>
+<img alt="" src="../../../resources/ant-build1.png"><br>
+<br>
+Now the default target of you magic build should be executed. The plugin has
added the transit jars and the junit jars to the ant classpath,
+which enables magic to correctly run<br>
+<br>
+<img alt="" src="../../../resources/ant-build2.png"><br>
+</body>
+</html>

Modified:
development/laboratory/ide/eclipse/magic/plugin/help/html/tasks/rebuilding.html
==============================================================================
---
development/laboratory/ide/eclipse/magic/plugin/help/html/tasks/rebuilding.html
(original)
+++
development/laboratory/ide/eclipse/magic/plugin/help/html/tasks/rebuilding.html
Thu Mar 10 03:55:22 2005
@@ -12,10 +12,15 @@
<br>
Right-click on the index.xml file and you should see e Popup-Entry
"Reload Magic index"<br>
+<img alt="index-rebuild" src="../../../resources/rebuild-index.png"
+ style="width: 563px; height: 808px;"><br>
<br>
The project should be rearranged so the source folders now referr to
the index project source and tst folders, and that the dependencies are
located in a Classpath container, named with the path of the choosen
index.xml.<br>
+<br>
+<img alt="" src="../../../resources/after-rebuild.png"
+ style="width: 651px; height: 799px;"><br>
</body>
</html>

Modified: development/laboratory/ide/eclipse/magic/plugin/help/toc_Tasks.xml
==============================================================================
--- development/laboratory/ide/eclipse/magic/plugin/help/toc_Tasks.xml
(original)
+++ development/laboratory/ide/eclipse/magic/plugin/help/toc_Tasks.xml Thu
Mar 10 03:55:22 2005
@@ -1,5 +1,6 @@
<toc label="Tasks">
<topic label="Basic Usage">
<topic label="Rebuild the Project with Magic"
href="help/html/tasks/rebuilding.html"/>
+ <topic label="Compile within Eclipse"
href="help/html/tasks/compiling.html"/>
</topic>
</toc>
\ No newline at end of file

Added: development/laboratory/ide/eclipse/magic/plugin/lib/junit-3.8.1.jar
==============================================================================
Binary file. No diff available.

Modified: development/laboratory/ide/eclipse/magic/plugin/plugin.xml
==============================================================================
--- development/laboratory/ide/eclipse/magic/plugin/plugin.xml (original)
+++ development/laboratory/ide/eclipse/magic/plugin/plugin.xml Thu Mar 10
03:55:22 2005
@@ -3,7 +3,7 @@
<plugin
id="net.dpml.ide.eclipse.plugins.Magic"
name="Eclipse Magic Plug-in"
- version="0.1.6"
+ version="0.1.91"
provider-name="DPML"
class="net.dpml.ide.eclipse.plugins.magic.MagicPlugin">
<runtime>
@@ -22,6 +22,9 @@
<library name="lib/dpml-transit-tools.jar">
<export name="*"/>
</library>
+ <library name="lib/junit-3.8.1.jar">
+ <export name="*"/>
+ </library>
</runtime>

<requires>

Added:
development/laboratory/ide/eclipse/magic/plugin/resources/after-rebuild.png
==============================================================================
Binary file. No diff available.

Added:
development/laboratory/ide/eclipse/magic/plugin/resources/ant-build1.png
==============================================================================
Binary file. No diff available.

Added:
development/laboratory/ide/eclipse/magic/plugin/resources/ant-build2.png
==============================================================================
Binary file. No diff available.

Added:
development/laboratory/ide/eclipse/magic/plugin/resources/rebuild-index.png
==============================================================================
Binary file. No diff available.

Modified:
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
==============================================================================
---
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
(original)
+++
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
Thu Mar 10 03:55:22 2005
@@ -18,6 +18,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -130,7 +131,7 @@
IdeProjectDefinition[] projects = index.getProjectDefinitions();
for ( int i = 0; i < projects.length; i++ ) {
IdeProjectDefinition project = projects[i];
- System.out.println( "Checking project " + project.getName());
+ MagicPlugin.logInfo( "Checking project " + project.getName());
collectSources(project, collectedSources);
}

@@ -143,7 +144,7 @@
sourceEntries.add(srcDir);
}
//add the magic container
- IClasspathEntry magicContainer = JavaCore.newContainerEntry( new
Path("net.dpml.MAGIC/Magic deps") );
+ IClasspathEntry magicContainer = JavaCore.newContainerEntry( new
Path("net.dpml.MAGIC/deps") );
sourceEntries.add(magicContainer);
IClasspathEntry jreContainer = JavaCore.newContainerEntry( new
Path("org.eclipse.jdt.launching.JRE_CONTAINER") );
sourceEntries.add(jreContainer);
@@ -172,7 +173,9 @@
private void collectSources( IdeProjectDefinition project, TreeMap
collectedSources )
{
IPath projectPath = new Path(project.getFullBaseDir().toString());
- IPath absoluteProjectPath =
ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(projectPath).getFullPath();
+ IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+ IResource fileForLocation =
root.getContainerForLocation(projectPath);
+ IPath absoluteProjectPath = fileForLocation.getFullPath();
IPath main = absoluteProjectPath.append("src/main");
IPath test = absoluteProjectPath.append("src/test");
IPath java = absoluteProjectPath.append("src/java");

Modified:
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
==============================================================================
---
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
(original)
+++
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
Thu Mar 10 03:55:22 2005
@@ -9,6 +9,8 @@
import org.eclipse.ant.internal.core.AntClasspathEntry;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.internal.compiler.ast.MagicLiteral;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.IStartup;
import org.osgi.framework.BundleContext;
@@ -52,7 +54,7 @@

private void fixAntClasspath()
{
- IAntClasspathEntry[] transitClasspath = new IAntClasspathEntry[2];
+ IAntClasspathEntry[] transitClasspath = new IAntClasspathEntry[3];
AntCorePreferences prefs =
AntCorePlugin.getPlugin().getPreferences();
IAntClasspathEntry[] coreClasspath =
prefs.getDefaultAntHomeEntries();
IAntClasspathEntry[] newClasspath;
@@ -61,6 +63,7 @@
{
transitClasspath[0] = new AntClasspathEntry(pluginPath +
"lib/dpml-transit-main.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 )
{
@@ -159,4 +162,16 @@
{
}

+ public static void log( String string, int severity )
+ {
+ MagicPlugin.getDefault().getLog().log(new Status(Status.INFO,
MagicPlugin.getDefault().getClass().getName(), 0, string, null));
+
+ }
+
+ public static void logInfo( String message )
+ {
+ log(message, Status.INFO);
+
+ }
+
}

Modified: development/laboratory/ide/eclipse/magic/update/site.xml
==============================================================================
--- development/laboratory/ide/eclipse/magic/update/site.xml (original)
+++ development/laboratory/ide/eclipse/magic/update/site.xml Thu Mar 10
03:55:22 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/net.dpml.ide.eclipse.Magic_0.1.6.jar"
id="net.dpml.ide.eclipse.Magic" version="0.1.6"/>
+ <feature url="features/net.dpml.ide.eclipse.Magic_0.1.91.jar"
id="net.dpml.ide.eclipse.Magic" version="0.1.91"/>
<category-def name="net.dpml.ide.eclipse.magic" label="Magic Eclipse
Plugin"/>
</site>


  • svn commit: r2002 - in development/laboratory/ide/eclipse/magic: features plugin plugin/help plugin/help/html/tasks plugin/lib plugin/resources plugin/src/net/dpml/ide/eclipse/plugins/magic update, peter, 03/09/2005

Archive powered by MHonArc 2.6.24.

Top of Page