Author: rich
Date: Thu Apr 14 12:36:42 2005
New Revision: 161346
URL: http://svn.apache.org/viewcvs?view=rev&rev=161346
Log:
Fixes for:
- http://issues.apache.org/jira/browse/BEEHIVE-452 : No compiler error when
strutsMerge file is missing in the extending page flow
- http://issues.apache.org/jira/browse/BEEHIVE-470 : No compiler warning
generated when a jsp file is missing from the inheriting pageflow directory
referenced by relative path
- http://issues.apache.org/jira/browse/BEEHIVE-491 : Global actions raised
by a shared flow should throw a compiler warning
- http://issues.apache.org/jira/browse/BEEHIVE-524 : classes in
org.apache.beehive.netui.util need to move into
org.apache.beehive.netui.util.internal
tests: bvt in netui (WinXP)
BB: self (linux)
Added:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/BouncyClassLoader.java
- copied, changed from r161207,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
- copied, changed from r161205,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/FileUtils.java
- copied, changed from r161205,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/ServletUtils.java
- copied, changed from r161205,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/ClassLevelCache.java
- copied, changed from r161244,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/MethodCache.java
- copied, changed from r161244,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java
- copied, changed from r161244,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java
Removed:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/FlowControllerChecker.java
Thu Apr 14 12:36:42 2005
@@ -321,6 +321,9 @@
checkInheritedRelativePaths( jclass );
}
+ /**
+ * Check relative paths in annotations inherited from a base class.
+ */
private void checkInheritedRelativePaths( ClassDeclaration jclass )
{
for ( ClassType type = jclass.getSuperclass();
@@ -329,63 +332,111 @@
{
TypeDeclaration decl = CompilerUtils.getDeclaration( type );
+ //
+ // Check simple actions in the Controller annotation.
+ //
List simpleActions =
CompilerUtils.getAnnotationArrayValue( decl,
CONTROLLER_TAG_NAME, SIMPLE_ACTIONS_ATTR, true );
if ( simpleActions != null )
{
- for ( Iterator ii = simpleActions.iterator(); ii.hasNext(); )
+ for ( Iterator j = simpleActions.iterator(); j.hasNext(); )
{
- AnnotationInstance i = ( AnnotationInstance ) ii.next();
- checkRelativePath( i, PATH_ATTR, jclass, decl );
- List conditionalForwards =
- CompilerUtils.getAnnotationArray( i,
CONDITIONAL_FORWARDS_ATTR, true );
+ AnnotationInstance i = ( AnnotationInstance ) j.next();
+ checkRelativePath( i, PATH_ATTR, jclass, decl, false );
+ List conditionalForwards =
CompilerUtils.getAnnotationArray( i, CONDITIONAL_FORWARDS_ATTR, true );
if ( conditionalForwards != null )
{
- for ( Iterator i2 = conditionalForwards.iterator();
i2.hasNext(); )
+ for ( Iterator k = conditionalForwards.iterator();
k.hasNext(); )
{
- AnnotationInstance j = ( AnnotationInstance )
i2.next();
- checkRelativePath( j, PATH_ATTR, jclass, decl );
+ AnnotationInstance ann = ( AnnotationInstance )
k.next();
+ checkRelativePath( ann, PATH_ATTR, jclass, decl,
false );
}
}
}
}
- List forwards =
- CompilerUtils.getAnnotationArrayValue( decl,
CONTROLLER_TAG_NAME, FORWARDS_ATTR, true );
+ //
+ // Check Forwards in the Controller annotation.
+ //
+ List forwards = CompilerUtils.getAnnotationArrayValue( decl,
CONTROLLER_TAG_NAME, FORWARDS_ATTR, true );
if ( forwards != null )
{
for ( Iterator ii = forwards.iterator(); ii.hasNext(); )
{
AnnotationInstance i = ( AnnotationInstance ) ii.next();
- checkRelativePath( i, PATH_ATTR, jclass, decl );
+ checkRelativePath( i, PATH_ATTR, jclass, decl, false );
}
}
- List catches =
- CompilerUtils.getAnnotationArrayValue( decl,
CONTROLLER_TAG_NAME, CATCHES_ATTR, true );
+ //
+ // Check Catches in the Controller annotation.
+ //
+ List catches = CompilerUtils.getAnnotationArrayValue( decl,
CONTROLLER_TAG_NAME, CATCHES_ATTR, true );
if ( catches != null )
{
- for ( Iterator ii = catches.iterator(); ii.hasNext(); )
+ for ( Iterator j = catches.iterator(); j.hasNext(); )
{
- AnnotationInstance i = ( AnnotationInstance ) ii.next();
- checkRelativePath( i, PATH_ATTR, jclass, decl );
+ AnnotationInstance i = ( AnnotationInstance ) j.next();
+ checkRelativePath( i, PATH_ATTR, jclass, decl, false );
}
}
+ //
+ // Check strutsMerge and validatorMerge in the Controller
annotation.
+ //
AnnotationInstance controllerAnnotation =
CompilerUtils.getAnnotation( decl, CONTROLLER_TAG_NAME );
if ( controllerAnnotation != null )
{
- checkRelativePath( controllerAnnotation, VALIDATOR_MERGE_ATTR,
jclass, decl );
+ checkRelativePath( controllerAnnotation, VALIDATOR_MERGE_ATTR,
jclass, decl, true );
+ checkRelativePath( controllerAnnotation, STRUTSMERGE_ATTR,
jclass, decl, true );
+ }
+
+ //
+ // Check Forwards and Catches on action methods and
exception-handler methods.
+ //
+ MethodDeclaration[] methods = decl.getMethods();
+ for ( int i = 0; i < methods.length; i++ )
+ {
+ MethodDeclaration method = methods[i];
+ AnnotationInstance ann = CompilerUtils.getAnnotation( method,
ACTION_TAG_NAME);
+ if ( ann == null ) ann = CompilerUtils.getAnnotation( method,
EXCEPTION_HANDLER_TAG_NAME );
+
+ if ( ann != null )
+ {
+ List methodForwards = CompilerUtils.getAnnotationArray(
ann, FORWARDS_ATTR, true );
+ String methodName = method.getSimpleName();
+
+ if ( methodForwards != null )
+ {
+ for ( Iterator j = methodForwards.iterator();
j.hasNext(); )
+ {
+ AnnotationInstance methodForward = (
AnnotationInstance ) j.next();
+ checkRelativePath( methodName, methodForward,
PATH_ATTR, jclass, decl, false );
+ }
+ }
+
+ List methodCatches = CompilerUtils.getAnnotationArray(
ann, CATCHES_ATTR, true );
+
+ if ( methodCatches != null )
+ {
+ for ( Iterator j = methodCatches.iterator();
j.hasNext(); )
+ {
+ AnnotationInstance methodCatch = (
AnnotationInstance ) j.next();
+ checkRelativePath( methodName, methodCatch,
PATH_ATTR, jclass, decl, false );
+ }
+ }
+ }
}
}
}
- private void checkRelativePath( AnnotationInstance ann, String memberName,
TypeDeclaration jclass, TypeDeclaration baseType )
+ private void checkRelativePath( AnnotationInstance ann, String memberName,
TypeDeclaration jclass,
+ TypeDeclaration baseType, boolean isError )
{
if ( ann != null )
{
@@ -397,14 +448,59 @@
if ( ! WebappPathType.relativePathExists( path, jclass,
getEnv() ) )
{
- getDiagnostics().addWarning(
- ann, "warning.inherited-file-not-found", path,
- ANNOTATION_INTERFACE_PREFIX +
ann.getAnnotationType().getDeclaration().getSimpleName(),
- baseType.getQualifiedName() );
+ String[] args = {
+ path,
+ ANNOTATION_INTERFACE_PREFIX +
ann.getAnnotationType().getDeclaration().getSimpleName(),
+ baseType.getQualifiedName()
+ };
+
+ if ( isError )
+ {
+ getDiagnostics().addErrorArrayArgs( ann,
"message.inherited-file-not-found", args );
+ }
+ else
+ {
+ getDiagnostics().addWarningArrayArgs( ann,
"message.inherited-file-not-found", args );
+ }
}
}
}
}
+
+ private void checkRelativePath( String methodName, AnnotationInstance ann,
String memberName,
+ TypeDeclaration jclass, TypeDeclaration
baseType, boolean isError )
+ {
+ if ( ann != null )
+ {
+ AnnotationValue pathVal = CompilerUtils.getAnnotationValue( ann,
memberName, true );
+
+ if ( pathVal != null )
+ {
+ String path = ( String ) pathVal.getValue();
+
+ if ( ! WebappPathType.relativePathExists( path, jclass,
getEnv() ) )
+ {
+ String[] args = {
+ path,
+ ANNOTATION_INTERFACE_PREFIX +
ann.getAnnotationType().getDeclaration().getSimpleName(),
+ methodName,
+ baseType.getQualifiedName()
+ };
+
+ if ( isError )
+ {
+ getDiagnostics().addErrorArrayArgs( ann,
"message.method-inherited-file-not-found", args );
+ }
+ else
+ {
+ getDiagnostics().addWarningArrayArgs( ann,
"message.method-inherited-file-not-found", args );
+ }
+ }
+ }
+ }
+ }
+
+
protected void checkField( FieldDeclaration field, TypeDeclaration jclass )
{
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties
Thu Apr 14 12:36:42 2005
@@ -182,8 +182,11 @@
error.no-matching-shared-flow-declared = There is no {0} annotation that
declares a shared flow with name "{1}".
warning.annotated-abstract-method = This annotation will have no effect on an
abstract method.
-warning.inherited-file-not-found = \
+message.inherited-file-not-found = \
File "{0}" (reference inherited from a {1} annotation on {2}) could not be
found in the web application.
+
+message.method-inherited-file-not-found = \
+File "{0}" (reference inherited from a {1} annotation on method {2} in {3})
could not be found in the web application.
error.absolute-path-required-for-tiles-def = \
An absolute path from the webapp root is required for a tiles definitions
configuration file.
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
Thu Apr 14 12:36:42 2005
@@ -86,11 +86,14 @@
}
}
- if ( ! foundIt )
+ //
+ // Look in (legacy) Global.app, unless the class being checked
is a shared flow (shared flows are
+ // the successor to Global.app -- they can't raise Global.app
actions.
+ //
+ if ( ! foundIt &&
+ ! CompilerUtils.isAssignableFrom( SHARED_FLOW_BASE_CLASS,
+
CompilerUtils.getOutermostClass( classMember ), getEnv() ) )
{
- //
- // Look in (legacy) Global.app
- //
TypeDeclaration globalAppDecl =
getEnv().getTypeDeclaration( GLOBALAPP_FULL_CLASSNAME );
if ( globalAppDecl != null )
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
Thu Apr 14 12:36:42 2005
@@ -23,7 +23,7 @@
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.PageFlowRequestWrapper;
import org.apache.beehive.netui.util.Bundle;
-import org.apache.beehive.netui.util.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
import org.apache.beehive.netui.util.config.ConfigUtil;
import org.apache.beehive.netui.util.config.bean.ModuleConfigLocators;
import org.apache.beehive.netui.util.config.bean.PageflowConfig;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java
Thu Apr 14 12:36:42 2005
@@ -23,7 +23,7 @@
import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.internal.CachedSharedFlowRefInfo;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
-import org.apache.beehive.netui.util.cache.ClassLevelCache;
+import org.apache.beehive.netui.util.internal.cache.ClassLevelCache;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
Thu Apr 14 12:36:42 2005
@@ -31,8 +31,8 @@
import org.apache.beehive.netui.pageflow.handler.FlowControllerHandlerContext;
import org.apache.beehive.netui.pageflow.handler.ActionForwardHandler;
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
-import org.apache.beehive.netui.util.FileUtils;
-import org.apache.beehive.netui.util.cache.ClassLevelCache;
+import org.apache.beehive.netui.util.internal.FileUtils;
+import org.apache.beehive.netui.util.internal.cache.ClassLevelCache;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.struts.Globals;
import org.apache.struts.util.TokenProcessor;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
Thu Apr 14 12:36:42 2005
@@ -36,7 +36,7 @@
import java.net.URL;
import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.util.FileUtils;
+import org.apache.beehive.netui.util.internal.FileUtils;
import org.apache.beehive.netui.pageflow.config.PageFlowActionForward;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.AdapterManager;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowActionServlet.java
Thu Apr 14 12:36:42 2005
@@ -24,7 +24,7 @@
import org.apache.beehive.netui.pageflow.handler.Handlers;
import org.apache.beehive.netui.pageflow.handler.FlowControllerHandlerContext;
import org.apache.beehive.netui.pageflow.handler.ForwardRedirectHandler;
-import org.apache.beehive.netui.util.ServletUtils;
+import org.apache.beehive.netui.util.internal.ServletUtils;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.ServletException;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
Thu Apr 14 12:36:42 2005
@@ -32,9 +32,9 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.ControllerConfig;
import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.util.FileUtils;
-import org.apache.beehive.netui.util.DiscoveryUtils;
-import org.apache.beehive.netui.util.cache.ClassLevelCache;
+import org.apache.beehive.netui.util.internal.FileUtils;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.cache.ClassLevelCache;
import org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig;
import org.apache.beehive.netui.pageflow.internal.CachedPageFlowInfo;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
Thu Apr 14 12:36:42 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.pageflow;
-import org.apache.beehive.netui.util.FileUtils;
+import org.apache.beehive.netui.util.internal.FileUtils;
import java.io.FilenameFilter;
import java.io.File;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
Thu Apr 14 12:36:42 2005
@@ -41,8 +41,8 @@
import org.apache.beehive.netui.core.urls.URLRewriterService;
import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.util.FileUtils;
-import org.apache.beehive.netui.util.ServletUtils;
+import org.apache.beehive.netui.util.internal.FileUtils;
+import org.apache.beehive.netui.util.internal.ServletUtils;
import org.apache.beehive.netui.pageflow.internal.DefaultURLRewriter;
import org.apache.beehive.netui.pageflow.internal.JavaControlUtils;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
Thu Apr 14 12:36:42 2005
@@ -45,9 +45,9 @@
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
-import org.apache.beehive.netui.util.DiscoveryUtils;
-import org.apache.beehive.netui.util.FileUtils;
-import org.apache.beehive.netui.util.ServletUtils;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.FileUtils;
+import org.apache.beehive.netui.util.internal.ServletUtils;
import org.apache.beehive.netui.util.config.ConfigUtil;
import org.apache.beehive.netui.util.config.bean.PageflowConfig;
import org.apache.beehive.netui.util.logging.Logger;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
Thu Apr 14 12:36:42 2005
@@ -32,8 +32,8 @@
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.scoping.ScopedResponse;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
-import org.apache.beehive.netui.util.FileUtils;
-import org.apache.beehive.netui.util.ServletUtils;
+import org.apache.beehive.netui.util.internal.FileUtils;
+import org.apache.beehive.netui.util.internal.ServletUtils;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
import org.apache.struts.action.ActionForm;
@@ -1080,24 +1080,18 @@
public static GlobalApp ensureGlobalApp( HttpServletRequest request,
HttpServletResponse response,
ServletContext servletContext )
{
- try
- {
- FlowControllerFactory.get( servletContext
).getSharedFlowsForRequest( new RequestContext( request, response ) );
- }
- catch ( ClassNotFoundException e )
- {
- _log.error( e );
- }
- catch ( InstantiationException e )
+ GlobalApp ga = getGlobalApp( request );
+
+ if ( ga != null )
{
- _log.error( e );
+ ga.reinitialize( request, response, servletContext );
}
- catch ( IllegalAccessException e )
+ else
{
- _log.error( e );
+ ga = FlowControllerFactory.getGlobalApp( request, response,
servletContext );
}
- return getGlobalApp( request );
+ return ga;
}
/**
@@ -1263,7 +1257,7 @@
/**
* Create a raw action URI, which can be modified before being sent
through the registered URL rewriting chain
- * using [EMAIL PROTECTED]
org.apache.beehive.netui.core.urls.URLRewriterService#rewriteURL}.
+ * using [EMAIL PROTECTED] URLRewriterService#rewriteURL}.
*
* @param servletContext the current ServletContext.
* @param request the current HttpServletRequest.
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/PageFlowViewHandler.java
Thu Apr 14 12:36:42 2005
@@ -21,7 +21,7 @@
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.PreviousPageInfo;
import org.apache.beehive.netui.pageflow.internal.PageFlowRequestWrapper;
-import org.apache.beehive.netui.util.FileUtils;
+import org.apache.beehive.netui.util.internal.FileUtils;
import javax.faces.application.ViewHandler;
import javax.faces.context.FacesContext;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
Thu Apr 14 12:36:42 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.pageflow.handler;
-import org.apache.beehive.netui.util.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
import org.apache.beehive.netui.util.config.bean.CustomProperty;
import org.apache.beehive.netui.util.config.bean.NetuiConfigDocument;
import org.apache.beehive.netui.util.config.bean.PageflowHandlers;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
Thu Apr 14 12:36:42 2005
@@ -18,7 +18,7 @@
package org.apache.beehive.netui.pageflow.interceptor;
import org.apache.beehive.netui.util.config.bean.CustomProperty;
-import org.apache.beehive.netui.util.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
import org.apache.beehive.netui.util.logging.Logger;
import java.io.Serializable;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
Thu Apr 14 12:36:42 2005
@@ -19,7 +19,7 @@
import org.apache.beehive.netui.pageflow.DefaultServletContainerAdapter;
import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
-import org.apache.beehive.netui.util.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.ServletContext;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
Thu Apr 14 12:36:42 2005
@@ -55,11 +55,10 @@
import org.apache.beehive.netui.pageflow.PageFlowEventReporter;
import org.apache.beehive.netui.pageflow.ExpressionMessage;
import org.apache.beehive.netui.pageflow.PageFlowUtils;
-import org.apache.beehive.netui.pageflow.GlobalApp;
import org.apache.beehive.netui.pageflow.handler.ExceptionsHandler;
import org.apache.beehive.netui.pageflow.handler.FlowControllerHandlerContext;
import org.apache.beehive.netui.util.Bundle;
-import org.apache.beehive.netui.util.cache.ClassLevelCache;
+import org.apache.beehive.netui.util.internal.cache.ClassLevelCache;
import org.apache.beehive.netui.util.logging.Logger;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java
Thu Apr 14 12:36:42 2005
@@ -21,10 +21,10 @@
import org.apache.beehive.netui.pageflow.ServletContainerAdapter;
import org.apache.beehive.netui.pageflow.RequestContext;
import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
-import org.apache.beehive.netui.util.classloader.BouncyClassLoader;
-import org.apache.beehive.netui.util.cache.ClassLevelCache;
+import org.apache.beehive.netui.util.internal.BouncyClassLoader;
+import org.apache.beehive.netui.util.internal.cache.ClassLevelCache;
import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.util.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
import javax.servlet.http.HttpSession;
import javax.servlet.ServletContext;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java
Thu Apr 14 12:36:42 2005
@@ -21,7 +21,7 @@
import org.apache.beehive.netui.pageflow.FacesBackingBean;
import org.apache.beehive.netui.pageflow.PageFlowUtils;
import org.apache.beehive.netui.pageflow.handler.Handlers;
-import org.apache.beehive.netui.util.FileUtils;
+import org.apache.beehive.netui.util.internal.FileUtils;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
Thu Apr 14 12:36:42 2005
@@ -27,7 +27,7 @@
import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.util.Bundle;
-import org.apache.beehive.netui.util.ServletUtils;
+import org.apache.beehive.netui.util.internal.ServletUtils;
import org.apache.beehive.netui.util.config.ConfigUtil;
import org.apache.beehive.netui.util.config.bean.PageflowConfig;
import org.apache.beehive.netui.util.logging.Logger;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java
Thu Apr 14 12:36:42 2005
@@ -24,7 +24,7 @@
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
-import org.apache.beehive.netui.util.FileUtils;
+import org.apache.beehive.netui.util.internal.FileUtils;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.ServletContext;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
Thu Apr 14 12:36:42 2005
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.beehive.netui.util.cache.PropertyCache;
+import org.apache.beehive.netui.util.internal.cache.PropertyCache;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.script.el.util.ParseUtils;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
Thu Apr 14 12:36:42 2005
@@ -31,7 +31,7 @@
import org.apache.beehive.netui.script.el.ExpressionParseException;
import org.apache.beehive.netui.script.el.parser.TokenMgrError;
import org.apache.beehive.netui.script.el.parser.ParseException;
-import org.apache.beehive.netui.util.cache.PropertyCache;
+import org.apache.beehive.netui.util.internal.cache.PropertyCache;
import org.apache.beehive.netui.util.type.TypeUtils;
import org.apache.beehive.netui.util.logging.Logger;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
Thu Apr 14 12:36:42 2005
@@ -18,7 +18,7 @@
package org.apache.beehive.netui.tags.databinding.invoke;
import org.apache.beehive.netui.util.Bundle;
-import org.apache.beehive.netui.util.cache.MethodCache;
+import org.apache.beehive.netui.util.internal.cache.MethodCache;
import org.apache.beehive.netui.util.logging.Logger;
import javax.servlet.jsp.JspException;
Modified:
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
(original)
+++
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/org/apache/beehive/netui/tomcat/TomcatServletContainerAdapter.java
Thu Apr 14 12:36:42 2005
@@ -22,11 +22,10 @@
import org.apache.beehive.netui.pageflow.SecurityProtocol;
import org.apache.beehive.netui.pageflow.internal.AdapterContext;
import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.util.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.DiscoveryUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
import javax.security.auth.login.LoginException;
public class TomcatServletContainerAdapter extends
DefaultServletContainerAdapter
Copied:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/BouncyClassLoader.java
(from r161207,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/BouncyClassLoader.java?view=diff&rev=161346&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java&r1=161207&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/BouncyClassLoader.java&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/classloader/BouncyClassLoader.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/BouncyClassLoader.java
Thu Apr 14 12:36:42 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.util.classloader;
+package org.apache.beehive.netui.util.internal;
import java.net.URLClassLoader;
import java.net.URL;
Copied:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
(from r161205,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java?view=diff&rev=161346&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java&r1=161205&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/DiscoveryUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/DiscoveryUtils.java
Thu Apr 14 12:36:42 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.util;
+package org.apache.beehive.netui.util.internal;
import org.apache.beehive.netui.util.logging.Logger;
Copied:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/FileUtils.java
(from r161205,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/FileUtils.java?view=diff&rev=161346&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java&r1=161205&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/FileUtils.java&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/FileUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/FileUtils.java
Thu Apr 14 12:36:42 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.util;
+package org.apache.beehive.netui.util.internal;
import java.io.File;
Copied:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/ServletUtils.java
(from r161205,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/ServletUtils.java?view=diff&rev=161346&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java&r1=161205&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/ServletUtils.java&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/ServletUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/ServletUtils.java
Thu Apr 14 12:36:42 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.util;
+package org.apache.beehive.netui.util.internal;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Copied:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/ClassLevelCache.java
(from r161244,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/ClassLevelCache.java?view=diff&rev=161346&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java&r1=161244&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/ClassLevelCache.java&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/ClassLevelCache.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/ClassLevelCache.java
Thu Apr 14 12:36:42 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.util.cache;
+package org.apache.beehive.netui.util.internal.cache;
import java.util.Map;
import
org.apache.beehive.netui.util.internal.concurrent.InternalConcurrentHashMap;
Copied:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/MethodCache.java
(from r161244,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/MethodCache.java?view=diff&rev=161346&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java&r1=161244&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/MethodCache.java&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/MethodCache.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/MethodCache.java
Thu Apr 14 12:36:42 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.util.cache;
+package org.apache.beehive.netui.util.internal.cache;
import java.lang.reflect.Method;
import
org.apache.beehive.netui.util.internal.concurrent.InternalConcurrentHashMap;
Copied:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java
(from r161244,
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java?view=diff&rev=161346&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java&r1=161244&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/cache/PropertyCache.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java
Thu Apr 14 12:36:42 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.util.cache;
+package org.apache.beehive.netui.util.internal.cache;
import java.beans.Introspector;
import java.beans.IntrospectionException;
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp?view=diff&r1=161345&r2=161346
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp
Thu Apr 14 12:36:42 2005
@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
<[EMAIL PROTECTED]
import="org.apache.beehive.netui.pageflow.PageFlowController"%>
<[EMAIL PROTECTED] import="org.apache.beehive.netui.pageflow.PageFlowUtils"%>
-<[EMAIL PROTECTED] import="org.apache.beehive.netui.util.FileUtils"%>
+<[EMAIL PROTECTED] import="org.apache.beehive.netui.util.internal.FileUtils"%>
<[EMAIL PROTECTED]
import="miniTests.pageFlowUtils.pageFlowUtilsController.TestForm"%>
<[EMAIL PROTECTED] import="org.apache.struts.action.ActionForm"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0";
prefix="netui-data"%>
