You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/05/24 18:06:51 UTC
svn commit: rev 20358 - in avalon/trunk/tools/magic: artifact/src/dist clean/src/dist engine/src/dist/plugins/plugin engine/src/java/org/apache/avalon engine/src/java/org/apache/avalon/magic engine/src/java/org/apache/merlin jar/src/dist java/src/dist prepare/src/dist test-project xdoc/src/dist
Author: niclas
Date: Mon May 24 09:06:50 2004
New Revision: 20358
Added:
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/
- copied from rev 20357, avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/
Removed:
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/
Modified:
avalon/trunk/tools/magic/artifact/src/dist/build.bsh
avalon/trunk/tools/magic/clean/src/dist/build.bsh
avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.bsh
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/AbstractPlugin.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Artifact.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Builder.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/CreationException.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/FacadeFactory.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Main.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Plugin.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginContext.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginFacade.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginObserver.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginProperties.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginServiceManager.java
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/ScriptFacade.java
avalon/trunk/tools/magic/jar/src/dist/build.bsh
avalon/trunk/tools/magic/java/src/dist/build.bsh
avalon/trunk/tools/magic/prepare/src/dist/build.bsh
avalon/trunk/tools/magic/test-project/build.bsh
avalon/trunk/tools/magic/xdoc/src/dist/build.bsh
Log:
Changed the package name to proper, and added the ASF Copyright notice in Magic...
Modified: avalon/trunk/tools/magic/artifact/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/artifact/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/artifact/src/dist/build.bsh Mon May 24 09:06:50 2004
@@ -1,3 +1,19 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -18,9 +34,9 @@
import java.util.Iterator;
import java.util.Properties;
-import org.apache.merlin.magic.AbstractPlugin;
-import org.apache.merlin.magic.Artifact;
-import org.apache.merlin.magic.Plugin;
+import org.apache.avalon.magic.AbstractPlugin;
+import org.apache.avalon.magic.Artifact;
+import org.apache.avalon.magic.Plugin;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
Modified: avalon/trunk/tools/magic/clean/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/clean/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/clean/src/dist/build.bsh Mon May 24 09:06:50 2004
@@ -1,10 +1,26 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
import java.io.File;
import java.io.IOException;
import java.util.StringTokenizer;
-import org.apache.merlin.magic.AbstractPlugin;
+import org.apache.avalon.magic.AbstractPlugin;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
Modified: avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.bsh (original)
+++ avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.bsh Mon May 24 09:06:50 2004
@@ -1,11 +1,27 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
import java.io.File;
-import org.apache.merlin.magic.AbstractPlugin;
-import org.apache.merlin.magic.Plugin;
-import org.apache.merlin.magic.PluginContext;
-import org.apache.merlin.magic.PluginFacade;
-import org.apache.merlin.magic.PluginServiceManager;
+import org.apache.avalon.magic.AbstractPlugin;
+import org.apache.avalon.magic.Plugin;
+import org.apache.avalon.magic.PluginContext;
+import org.apache.avalon.magic.PluginFacade;
+import org.apache.avalon.magic.PluginServiceManager;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/AbstractPlugin.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/AbstractPlugin.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/AbstractPlugin.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
import java.util.ArrayList;
import java.util.Iterator;
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Artifact.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/Artifact.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Artifact.java Mon May 24 09:06:50 2004
@@ -1,5 +1,21 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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
-package org.apache.merlin.magic;
+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.
+*/
+
+package org.apache.avalon.magic;
public class Artifact
{
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Builder.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/Builder.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Builder.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
import java.io.File;
import java.io.FileInputStream;
@@ -135,6 +152,8 @@
private void loadMagicPluginProperties( PluginProperties props )
{
+/* I think this happens in the servicemanager.lookup(), which would
+ mean on demand only = much faster.
File[] plugins = m_SystemDir.listFiles();
for( int i=0 ; i < plugins.length ; i++ )
{
@@ -142,6 +161,7 @@
if( file.exists() )
load( props, file );
}
+*/
}
private void loadProjectSystemProperties( PluginProperties props )
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/CreationException.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/CreationException.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/CreationException.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
public class CreationException extends Exception
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/FacadeFactory.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/FacadeFactory.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/FacadeFactory.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
import java.io.File;
import java.io.IOException;
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Main.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/Main.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Main.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
import java.io.BufferedReader;
import java.io.File;
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Plugin.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/Plugin.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/Plugin.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
public interface Plugin
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginContext.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginContext.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginContext.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
import java.io.File;
import java.util.Iterator;
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginFacade.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginFacade.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginFacade.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
public interface PluginFacade
{
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginObserver.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginObserver.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginObserver.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
public interface PluginObserver
{
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginProperties.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginProperties.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginProperties.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
import java.util.Properties;
import java.util.Stack;
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginServiceManager.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginServiceManager.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/PluginServiceManager.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
import java.io.File;
import java.io.FileInputStream;
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/ScriptFacade.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/ScriptFacade.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/ScriptFacade.java Mon May 24 09:06:50 2004
@@ -1,4 +1,21 @@
-package org.apache.merlin.magic;
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
+
+package org.apache.avalon.magic;
import java.io.BufferedReader;
import java.io.File;
Modified: avalon/trunk/tools/magic/jar/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/jar/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/jar/src/dist/build.bsh Mon May 24 09:06:50 2004
@@ -1,3 +1,19 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
import java.io.File;
import java.io.IOException;
@@ -5,10 +21,10 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.merlin.magic.AbstractPlugin;
-import org.apache.merlin.magic.Artifact;
-import org.apache.merlin.magic.Plugin;
-import org.apache.merlin.magic.PluginContext;
+import org.apache.avalon.magic.AbstractPlugin;
+import org.apache.avalon.magic.Artifact;
+import org.apache.avalon.magic.Plugin;
+import org.apache.avalon.magic.PluginContext;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
Modified: avalon/trunk/tools/magic/java/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/java/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/java/src/dist/build.bsh Mon May 24 09:06:50 2004
@@ -1,3 +1,19 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
import java.io.File;
import java.io.IOException;
@@ -5,10 +21,10 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.merlin.magic.AbstractPlugin;
-import org.apache.merlin.magic.Artifact;
-import org.apache.merlin.magic.Plugin;
-import org.apache.merlin.magic.PluginContext;
+import org.apache.avalon.magic.AbstractPlugin;
+import org.apache.avalon.magic.Artifact;
+import org.apache.avalon.magic.Plugin;
+import org.apache.avalon.magic.PluginContext;
import org.apache.avalon.framework.logger.Logger;
Modified: avalon/trunk/tools/magic/prepare/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/prepare/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/prepare/src/dist/build.bsh Mon May 24 09:06:50 2004
@@ -1,12 +1,28 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.merlin.magic.AbstractPlugin;
-import org.apache.merlin.magic.Plugin;
-import org.apache.merlin.magic.PluginContext;
+import org.apache.avalon.magic.AbstractPlugin;
+import org.apache.avalon.magic.Plugin;
+import org.apache.avalon.magic.PluginContext;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
Modified: avalon/trunk/tools/magic/test-project/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/test-project/build.bsh (original)
+++ avalon/trunk/tools/magic/test-project/build.bsh Mon May 24 09:06:50 2004
@@ -1,6 +1,22 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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
-import org.apache.merlin.magic.Plugin;
-import org.apache.merlin.magic.PluginContext;
+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.
+*/
+
+import org.apache.avalon.magic.Plugin;
+import org.apache.avalon.magic.PluginContext;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
Modified: avalon/trunk/tools/magic/xdoc/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/xdoc/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/xdoc/src/dist/build.bsh Mon May 24 09:06:50 2004
@@ -1,9 +1,25 @@
+/*
+Copyright 2004 The Apache Software Foundation
+Licensed 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.
+*/
import java.io.File;
-import org.apache.merlin.magic.AbstractPlugin;
-import org.apache.merlin.magic.Plugin;
-import org.apache.merlin.magic.PluginContext;
+import org.apache.avalon.magic.AbstractPlugin;
+import org.apache.avalon.magic.Plugin;
+import org.apache.avalon.magic.PluginContext;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
@@ -27,7 +43,7 @@
String theme = m_Context.getProperty( "xdoc.theme.name" );
String output = m_Context.getProperty( "xdoc.output.format" );
- File themeDir = new File( m_Context.getPluginDir(), "themes/" + theme + "/" + output );
+ File themeDir = new File( m_Context.getProjectSystemDir(), "themes/" + theme + "/" + output );
getLogger().info( " Source: " + srcDir.getAbsolutePath() );
getLogger().info( " Dest: " + destDir.getAbsolutePath() );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org