Author: kentam
Date: Thu Feb 17 00:39:55 2005
New Revision: 154140
URL: http://svn.apache.org/viewcvs?view=rev&rev=154140
Log:
Fixes for:
BEEHIVE-208: Need an implementation of ControlAssemblyContext.WebAppModule
BEEHIVE-272: Change ControlAssemblyContext.createJavaOutputFile() to
ControlAssemblyContext.getSrcOutputDir()
Contributed by: Lawrence Jones
Added:
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/WebAppAssemblyContext.java
(with props)
Modified:
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/ControlAssemblyContext.java
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/BaseAssemblyContext.java
Modified:
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/ControlAssemblyContext.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/ControlAssemblyContext.java?view=diff&r1=154139&r2=154140
==============================================================================
---
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/ControlAssemblyContext.java
(original)
+++
incubator/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/assembly/ControlAssemblyContext.java
Thu Feb 17 00:39:55 2005
@@ -137,12 +137,18 @@
String getDefaultImplClassName();
/**
+ * @deprecated
* @return a File into which Java source can be written.
* Results in a file called <className>.java (in the
* directory given by <packageName>).
*/
File createJavaOutputFile(String packageName,
String className);
+
+ /**
+ * @return the output directory into which "compilable" source should be
output.
+ */
+ File getSrcOutputDir();
/**
* @return the root of the module for which assembly is taking place.
Modified:
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/BaseAssemblyContext.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/BaseAssemblyContext.java?view=diff&r1=154139&r2=154140
==============================================================================
---
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/BaseAssemblyContext.java
(original)
+++
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/BaseAssemblyContext.java
Thu Feb 17 00:39:55 2005
@@ -124,6 +124,11 @@
return new File(dir, className + ".java");
}
+ public File getSrcOutputDir()
+ {
+ return _srcOutputRoot;
+ }
+
public File getModuleDir()
{
return _moduleRoot;
Added:
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/WebAppAssemblyContext.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/WebAppAssemblyContext.java?view=auto&rev=154140
==============================================================================
---
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/WebAppAssemblyContext.java
(added)
+++
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/WebAppAssemblyContext.java
Thu Feb 17 00:39:55 2005
@@ -0,0 +1,61 @@
+package org.apache.beehive.controls.runtime.assembly;
+
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+
+import org.apache.beehive.controls.api.assembly.ControlAssemblyContext;
+import org.apache.beehive.controls.api.assembly.ControlAssemblyException;
+
+import java.io.File;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A ControlAssemblyContext implementation supporting standard web-app modules
+ */
+public class WebAppAssemblyContext extends BaseAssemblyContext
+ implements ControlAssemblyContext.WebAppModule
+{
+ public static class Factory implements ControlAssemblyContext.Factory
+ {
+ public WebAppAssemblyContext newInstance( Class controlIntfOrExt,
+ Map<String,String> bindings,
+ Set<String> clients,
+ File moduleRoot,
+ String moduleName,
+ File srcOutputRoot )
+ throws ControlAssemblyException
+ {
+ return new WebAppAssemblyContext( controlIntfOrExt, bindings,
clients,
+ moduleRoot, moduleName, srcOutputRoot );
+ }
+ }
+
+ protected WebAppAssemblyContext( Class controlIntfOrExt,
Map<String,String> bindings,
+ Set<String> clients, File moduleRoot,
+ String moduleName, File srcOutputRoot )
+ throws ControlAssemblyException
+ {
+ super( controlIntfOrExt, bindings, clients, moduleRoot, moduleName,
srcOutputRoot );
+ }
+
+ public File getWebXml()
+ {
+ return new File( getModuleDir(), "META-INF" + File.separator +
"web.xml");
+ }
+}
Propchange:
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/assembly/WebAppAssemblyContext.java
------------------------------------------------------------------------------
svn:eol-style = native
