You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/03/01 05:51:56 UTC
cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application BlockEntry.java
donaldp 2003/02/28 20:51:56
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockEntry.java
Added: lib/container LICENSE.isorelax.txt LICENSE.jing.txt
isorelax.jar jing.jar
Removed: lib/jing LICENSE.isorelax.txt LICENSE.jing.txt isorelax.jar
jing.jar
Log:
Migrate jing to container classloader
Revision Changes Path
1.1 avalon-phoenix/lib/container/LICENSE.isorelax.txt
Index: LICENSE.isorelax.txt
===================================================================
sCopyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Kohsuke Kawaguchi, and MURATA Makoto)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1.1 avalon-phoenix/lib/container/LICENSE.jing.txt
Index: LICENSE.jing.txt
===================================================================
Copyright (c) 2001, 2002 Thai Open Source Software Center Ltd
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
Neither the name of the Thai Open Source Software Center Ltd nor
the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1.1 avalon-phoenix/lib/container/isorelax.jar
<<Binary file>>
1.1 avalon-phoenix/lib/container/jing.jar
<<Binary file>>
1.27 +17 -3 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java
Index: BlockEntry.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- BlockEntry.java 1 Mar 2003 03:39:45 -0000 1.26
+++ BlockEntry.java 1 Mar 2003 04:51:56 -0000 1.27
@@ -20,6 +20,8 @@
*/
class BlockEntry
{
+ private static final Class BLOCK_CLASS = getBlockClass();
+
private Object m_object;
private final ComponentProfile m_componentProfile;
private BlockInvocationHandler m_invocationHandler;
@@ -126,8 +128,20 @@
//extends Component. The magic is that the Block
//interface has no methods and thus will never cause
//any issues for Proxy class.
- classes[ services.length ] =
- org.apache.avalon.phoenix.Block.class;
+ classes[ services.length ] = BLOCK_CLASS;
return classes;
}
-}
+
+
+ private static Class getBlockClass()
+ {
+ try
+ {
+ return Class.forName( "org.apache.avalon.phoenix.Block" );
+ }
+ catch( ClassNotFoundException e )
+ {
+ throw new IllegalStateException( "Can not find block class" );
+ }
+ }
+ }
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org