oberhack 2004/03/29 10:50:32
Modified:
ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container
MerlinContainerEnvironment.java
ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/nature
MerlinProjectNature.java
ide/org.apache.avalon.ide.eclipse.launch .classpath
plugin.xml
ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch
MerlinDeveloperLaunch.java
Added: ide/org.apache.avalon.ide.eclipse.launch/doc schema.css
book.css
ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/builder
MerlinBuilderFactory.java IMerlinBuilder.java
Removed:
ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/nature
MerlinContainerConfigNature.java
ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/builder
MerlinBuilder.java
Log:
Revision Changes Path
1.3 +1 -4
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container/MerlinContainerEnvironment.java
Index: MerlinContainerEnvironment.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container/MerlinContainerEnvironment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MerlinContainerEnvironment.java 2 Mar 2004 12:23:17 -0000 1.2
+++ MerlinContainerEnvironment.java 29 Mar 2004 18:50:32 -0000 1.3
@@ -29,10 +29,7 @@
try
{
- DefaultsBuilder db = new DefaultsBuilder("merlin", null);
- Object obj = db.getHomeProperties();
-
- Object o = obj;
+ new DefaultsBuilder("merlin", null);
} catch (Exception e)
{
1.1
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/doc/schema.css
Index: schema.css
===================================================================
H6.CaptionFigColumn#header {
font-size:16px;
display:inline
}
P.Note#copyright {
font-size: smaller;
font-style: normal;
color: #336699;
display:inline;
margin-top: 3.000000pt;
margin-bottom: 11.000000pt;
margin-right: 0.000000pt;
margin-left: 0.000000pt;
}
P.Code#dtd {
color: #800000;
margin-top: 0.000000pt;
margin-bottom: 0.000000pt;
margin-right: 0.000000pt;
margin-left: 10.000000pt;
}
P.Code#dtdAttlist {
color: #800000;
margin-top: 0.000000pt;
margin-bottom: 0.000000pt;
margin-right: 0.000000pt;
margin-left: 20.000000pt;
}
P.Code#tag {
color: #000080;
display:inline;
margin-top: 0.000000pt;
margin-bottom: 0.000000pt;
margin-right: 0.000000pt;
margin-left: 0.000000pt;
}
P.Code#cstring {
color: #008000;
display:inline;
margin-top: 0.000000pt;
margin-bottom: 0.000000pt;
margin-right: 0.000000pt;
margin-left: 0.000000pt;
}
.ConfigMarkup#elementDesc {
color: black;
margin-top: 0.000000pt;
margin-bottom: 0.000000pt;
margin-right: 0.000000pt;
margin-left: 10.000000pt;
}
.ConfigMarkup#attlistDesc {
color: black;
margin-top: 0.000000pt;
margin-bottom: 0.000000pt;
margin-right: 0.000000pt;
margin-left: 32.000000pt;
}
1.1
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/doc/book.css
Index: book.css
===================================================================
P.Code {
display: block;
text-align: left;
text-indent: 0.00pt;
margin-top: 0.000000pt;
margin-bottom: 0.000000pt;
margin-right: 0.000000pt;
margin-left: 15pt;
font-size: 10.000000pt;
font-weight: medium;
font-style: Regular;
color: #4444CC;
text-decoration: none;
vertical-align: baseline;
text-transform: none;
font-family: "Courier New";
}
H6.CaptionFigColumn {
display: block;
text-align: left;
text-indent: 0.000000pt;
margin-top: 3.000000pt;
margin-bottom: 11.000000pt;
margin-right: 0.000000pt;
margin-left: 0.000000pt;
font-size: 9.000000pt;
font-weight: medium;
font-style: Italic;
color: #000000;
text-decoration: none;
vertical-align: baseline;
text-transform: none;
font-family: "Arial";
}
P.Note {
display: block;
text-align: left;
text-indent: 0pt;
margin-top: 19.500000pt;
margin-bottom: 19.500000pt;
margin-right: 0.000000pt;
margin-left: 30pt;
font-size: 11.000000pt;
font-weight: medium;
font-style: Italic;
color: #000000;
text-decoration: none;
vertical-align: baseline;
text-transform: none;
font-family: "Arial";
}
EM.UILabel {
font-weight: Bold;
font-style: Regular;
text-decoration: none;
vertical-align: baseline;
text-transform: none;
}
EM.CodeName {
font-weight: Bold;
font-style: Regular;
text-decoration: none;
vertical-align: baseline;
text-transform: none;
font-family:"Courier New";
}
/* following font face declarations need to be removed for DBCS */
body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd,
dt {font-family: Arial, Helvetica, sans-serif; color: #000000}
pre { font-family: Courier, monospace}
/* end font face declarations */
/* following font size declarations should be OK for DBCS */
body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd,
dt {font-size: 10pt; }
pre { font-size: 10pt}
/* end font size declarations */
body { background: #FFFFFF}
h1 { font-size: 18pt; margin-top: 5; margin-bottom: 1 }
h2 { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
h3 { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
h4 { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style:
italic }
p { margin-top: 10px; margin-bottom: 10px }
pre { margin-left: 6; font-size: 9pt }
a:link { color: #0000FF }
a:hover { color: #000080 }
a:visited { text-decoration: underline }
ul { margin-top: 0; margin-bottom: 10 }
li { margin-top: 0; margin-bottom: 0 }
li p { margin-top: 0; margin-bottom: 0 }
ol { margin-top: 0; margin-bottom: 10 }
dl { margin-top: 0; margin-bottom: 10 }
dt { margin-top: 0; margin-bottom: 0; font-weight: bold }
dd { margin-top: 0; margin-bottom: 0 }
strong { font-weight: bold}
em { font-style: italic}
var { font-style: italic}
div.revision { border-left-style: solid; border-left-width: thin;
border-left-color: #7B68EE; padding-left:5 }
th { font-weight: bold }
1.3 +3 -36
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/nature/MerlinProjectNature.java
Index: MerlinProjectNature.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/nature/MerlinProjectNature.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MerlinProjectNature.java 16 Feb 2004 21:04:03 -0000 1.2
+++ MerlinProjectNature.java 29 Mar 2004 18:50:32 -0000 1.3
@@ -18,9 +18,7 @@
package org.apache.avalon.ide.eclipse.merlin.nature;
import org.apache.avalon.ide.eclipse.merlin.launch.MerlinDeveloperLaunch;
-import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
@@ -74,7 +72,9 @@
* @see org.eclipse.core.resources.IProjectNature#configure()
*/
public void configure() throws CoreException
- {}
+ {
+
+ }
public void deconfigure() throws CoreException
{
@@ -84,39 +84,6 @@
public String getDocumentBase()
{
return this.getProject().getLocation().toString();
- }
-
- // not used yet
- protected void addToBuildSpec(String builderID) throws CoreException
- {
-
- IProjectDescription description = getProject().getDescription();
- ICommand[] commands = description.getBuildSpec();
- boolean found = false;
-
- for (int i = 0; i < commands.length; ++i)
- {
- if (commands[i].getBuilderName().equals(builderID))
- {
- found = true;
- break;
- }
- }
-
- if (!found)
- {
- //add builder to project
- ICommand command = description.newCommand();
- command.setBuilderName(builderID);
- ICommand[] newCommands = new ICommand[commands.length + 1];
-
- // Add it before other builders.
- System.arraycopy(commands, 0, newCommands, 1, commands.length);
- newCommands[0] = command;
- description.setBuildSpec(newCommands);
- getProject().setDescription(description, null);
- }
-
}
/*
1.1
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/builder/MerlinBuilderFactory.java
Index: MerlinBuilderFactory.java
===================================================================
/*
* One has to add the builder to a project first.
* This is done, when the project is build in
* MerlinDeveloperCore ProjectResource.addBuilder()
*/
package org.apache.avalon.ide.eclipse.merlin.builder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
/**
* @author Andreas Develop
*
* To change the template for this generated type comment go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
public class MerlinBuilderFactory extends IncrementalProjectBuilder
{
private static List builderList = new ArrayList();
/**
*
*/
public MerlinBuilderFactory()
{
super();
}
/*
* Add builders to the build process. This method is also called
* by other plug-in (e.g. EnterpriseDeveloper).
* Registration of builders is done in the main plug-in class (eg.
EnterpriseDeveloperCore.java)
*
*/
public static void addBuilder(IMerlinBuilder builder)
{
// builderList.add(new YourOwnBuilder());
builderList.add(builder);
}
/* (non-Javadoc)
* @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int,
java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
*/
protected IProject[] build(int pKind, Map pArgs, IProgressMonitor
pMonitor)
throws CoreException
{
if(getDelta(getProject())==null) return null;
IResourceDelta delta[] = getDelta(getProject()).getAffectedChildren();
List files = getChangedResource(delta);
Iterator it = builderList.iterator();
while (it.hasNext())
{
IMerlinBuilder builder = (IMerlinBuilder) it.next();
builder.build(pKind, getProject(), files, pMonitor);
}
IJavaProject proj = JavaCore.create(getProject());
proj.getProject().refreshLocal(IProject.DEPTH_INFINITE, null);
return null;
}
/*
* retrieves the changed resource.
* only returns changed java resources (java source files)
*/
private List getChangedResource(IResourceDelta delta[])
{
List res = new ArrayList();
for (int i = 0; delta.length > i; i++)
{
if (delta[i].getAffectedChildren().length > 0)
{
res.addAll(getChangedResource(delta[i].getAffectedChildren()));
} else
{
res.add(delta[i].getResource());
}
}
return res;
}
}
1.1
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/builder/IMerlinBuilder.java
Index: IMerlinBuilder.java
===================================================================
/*
* Created on 15.03.2004
*
* To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.apache.avalon.ide.eclipse.merlin.builder;
import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
/**
* @author Andreas Develop
*
* To change the template for this generated type comment go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
public interface IMerlinBuilder
{
/**
* @param pKind
* @param pArgs
* @param pMonitor
*/
public void build(int pKind, IProject project, List pFiles,
IProgressMonitor pMonitor);
}
1.4 +1 -9
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/.classpath
Index: .classpath
===================================================================
RCS file:
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/.classpath,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .classpath 16 Feb 2004 21:04:02 -0000 1.3
+++ .classpath 29 Mar 2004 18:50:32 -0000 1.4
@@ -1,16 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="lib" path="lib/merlin-cli-3.2.4.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/merlin-cli-3.2.4.jar"/>
- <classpathentry kind="lib" path="lib/merlin-impl-3.2.4.jar"/>
- <classpathentry kind="lib" path="lib/merlin-api-3.2.jar"/>
- <classpathentry kind="lib" path="lib/avalon-framework-api-4.1.5.jar"/>
- <classpathentry kind="lib" path="lib/avalon-framework-impl-4.1.5.jar"/>
- <classpathentry kind="lib" path="lib/avalon-util-criteria-1.0.jar"/>
- <classpathentry kind="lib" path="lib/avalon-util-defaults-1.1.jar"/>
- <classpathentry kind="lib" path="lib/avalon-util-env-1.0.jar"/>
- <classpathentry kind="lib" path="lib/avalon-util-exception-1.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.6 +6 -13
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/plugin.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.xml 2 Mar 2004 12:23:17 -0000 1.5
+++ plugin.xml 29 Mar 2004 18:50:32 -0000 1.6
@@ -24,17 +24,17 @@
<import plugin="org.apache.avalon.MerlinDeveloperCore"/>
</requires>
+
<extension
id="merlinBuilder"
name="Merlin Builder"
point="org.eclipse.core.resources.builders">
<builder>
<run
-
class="org.apache.avalon.ide.eclipse.merlin.builder.MerlinBuilder">
+
class="org.apache.avalon.ide.eclipse.merlin.builder.MerlinBuilderFactory">
</run>
</builder>
</extension>
-
<extension
id="merlinProjectNature"
name="MerlinDeveloperProjectNature"
@@ -44,16 +44,9 @@
class="org.apache.avalon.ide.eclipse.merlin.nature.MerlinProjectNature">
</run>
</runtime>
- </extension>
- <extension
- id="merlinConfigNature"
- name="MerlinConfigNature"
- point="org.eclipse.core.resources.natures">
- <runtime>
- <run
-
class="org.apache.avalon.ide.eclipse.merlin.nature.MerlinContainerConfigNature">
- </run>
- </runtime>
+ <builder
+ id="org.apache.avalon.MerlinDeveloperLaunch.merlinBuilder">
+ </builder>
</extension>
<extension
point="org.eclipse.debug.core.launchConfigurationTypes">
@@ -85,8 +78,8 @@
<shortcut
label="Merlin Container"
icon="icons/merlin_light.gif"
-
class="org.apache.avalon.ide.eclipse.merlin.launch.MerlinLaunchShortcut"
modes="run, debug"
+
class="org.apache.avalon.ide.eclipse.merlin.launch.MerlinLaunchShortcut"
id="org.apache.avalon.ide.eclipse.merlin.launch.merlinLaunchShortcut">
<perspective
id="org.eclipse.jdt.ui.JavaPerspective">
1.4 +3 -0
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/MerlinDeveloperLaunch.java
Index: MerlinDeveloperLaunch.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/MerlinDeveloperLaunch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MerlinDeveloperLaunch.java 2 Mar 2004 12:23:17 -0000 1.3
+++ MerlinDeveloperLaunch.java 29 Mar 2004 18:50:32 -0000 1.4
@@ -62,6 +62,9 @@
plugin = this;
try
{
+ // activate EnterpriseDeveloper if present
+ Platform.getPlugin("biz.softwarefabrik.j4ee.core");
+
resourceBundle =
ResourceBundle.getBundle(
"org.apache.avalon.ide.eclipse.merlin.launch.MerlinDeveloperLaunchResources");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
