Menu
▾
▴
jboss-cvs-commits — CVS commits for JBoss
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
| 2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
| 2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
| 2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
| 2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rajesh R. <raj...@jb...> - 2006-07-10 19:52:16
|
User: rrajasekaran
Date: 06/07/10 15:52:14
Modified: etc/cruisecontrol/templates projects-db.xml
projects-matrix.xml projects-web.xml projects.xml
Log:
Updated jboss-dev mailing list
Revision Changes Path
1.14 +6 -6 tools/etc/cruisecontrol/templates/projects-db.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: projects-db.xml
===================================================================
RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/templates/projects-db.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- projects-db.xml 24 May 2006 18:40:30 -0000 1.13
+++ projects-db.xml 10 Jul 2006 19:52:13 -0000 1.14
@@ -131,7 +131,7 @@
timeout="10800"
logbuilddirectory="jbpm-db-matrix"
testResults="checkout/jbpm-db-matrix/jbpm.db/build/hsqldb/testresults/xml/TESTS-TestSuites.xml"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb...">
</project>
@@ -145,7 +145,7 @@
timeout="10800"
logbuilddirectory="jbpm-db-matrix"
testResults="checkout/jbpm-db-matrix/jbpm.db/build/mysql/testresults/xml/TESTS-TestSuites.xml"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb...">
</project>
@@ -159,7 +159,7 @@
timeout="10800"
logbuilddirectory="jbpm-db-matrix"
testResults="checkout/jbpm-db-matrix/jbpm.db/build/oracle/testresults/xml/TESTS-TestSuites.xml"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb...">
</project>
@@ -173,7 +173,7 @@
timeout="10800"
logbuilddirectory="jbpm-db-matrix"
testResults="checkout/jbpm-db-matrix/jbpm.db/build/sybase/testresults/xml/TESTS-TestSuites.xml"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb...">
</project>
@@ -187,7 +187,7 @@
timeout="18000"
logbuilddirectory="jbpm-db-matrix"
testResults="checkout/jbpm-db-matrix/jbpm.db/build/db2/testresults/xml/TESTS-TestSuites.xml"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb...">
</project>
@@ -201,7 +201,7 @@
timeout="10800"
logbuilddirectory="jbpm-db-matrix"
testResults="checkout/jbpm-db-matrix/jbpm.db/build/mssql/testresults/xml/TESTS-TestSuites.xml"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb...">
</project>
1.8 +3 -3 tools/etc/cruisecontrol/templates/projects-matrix.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: projects-matrix.xml
===================================================================
RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/templates/projects-matrix.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- projects-matrix.xml 5 Jul 2006 16:24:31 -0000 1.7
+++ projects-matrix.xml 10 Jul 2006 19:52:13 -0000 1.8
@@ -24,7 +24,7 @@
cvsmodule=""
jbossdir=""
emailFrom="qa...@jb..."
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb..."
skipusers="false"
reportWhenFixed="true">
@@ -111,7 +111,7 @@
cvsbranch="HEAD"
cvsmodule="jboss-portal-2.4"
jbossdir="jboss-portal-2.4"
- emailFailureTo="jbo...@li...,qa...@jb...">
+ emailFailureTo="jbo...@li...,qa...@jb...">
</project>
<project template="projecttemplate.vm"
@@ -125,7 +125,7 @@
logbuilddirectory="jboss-cache"
testResults="checkout/jboss-cache/output/reports/html/TESTS-TestSuites.xml"
cvsbranch="HEAD"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="dev...@jb...,qa...@jb..."
jbossdir="jboss-cache">
</project>
1.15 +5 -5 tools/etc/cruisecontrol/templates/projects-web.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: projects-web.xml
===================================================================
RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/templates/projects-web.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- projects-web.xml 19 Jun 2006 21:01:10 -0000 1.14
+++ projects-web.xml 10 Jul 2006 19:52:13 -0000 1.15
@@ -24,7 +24,7 @@
cvsmodule=""
jbossdir=""
emailFrom="qa...@jb..."
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb..."
skipusers="false"
reportWhenFixed="true">
@@ -48,8 +48,8 @@
timeout="10800"
logbuilddirectory="jbossweb"
testResults="checkout/jbossweb/build/testout/TESTS-TestSuites.xml"
- emailFailureTo="jbo...@li...,qa...@jb..."
- emailAlwaysTo="jbo...@li...,qa...@jb...">
+ emailFailureTo="jbo...@li...,qa...@jb..."
+ emailAlwaysTo="jbo...@li...,qa...@jb...">
</project>
<project template="jbosslabstemplate.vm"
@@ -62,8 +62,8 @@
timeout="10800"
logbuilddirectory="jbossweb-windows"
testResults="checkout/jbossweb/build/testout/TESTS-TestSuites.xml"
- emailFailureTo="jbo...@li...,qa...@jb..."
- emailAlwaysTo="jbo...@li...,qa...@jb...">
+ emailFailureTo="jbo...@li...,qa...@jb..."
+ emailAlwaysTo="jbo...@li...,qa...@jb...">
</project>
<!--
<project template="projecttemplate.vm"
1.71 +6 -6 tools/etc/cruisecontrol/templates/projects.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: projects.xml
===================================================================
RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/templates/projects.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- projects.xml 5 Jul 2006 16:23:33 -0000 1.70
+++ projects.xml 10 Jul 2006 19:52:13 -0000 1.71
@@ -24,7 +24,7 @@
cvsmodule=""
jbossdir=""
emailFrom="qa...@jb..."
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb..."
skipusers="false"
reportWhenFixed="true">
@@ -270,7 +270,7 @@
cvsbranch="HEAD"
cvsmodule="jboss-portal-2.4"
jbossdir="jboss-portal-2.4"
- emailFailureTo="jbo...@li...,qa...@jb...">
+ emailFailureTo="jbo...@li...,qa...@jb...">
</project>
<project template="projecttemplate.vm"
@@ -284,7 +284,7 @@
logbuilddirectory="jboss-cache"
testResults="checkout/jboss-cache/output/reports/html/TESTS-TestSuites.xml"
cvsbranch="HEAD"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="dev...@jb...,qa...@jb..."
jbossdir="jboss-cache">
</project>
@@ -300,7 +300,7 @@
logbuilddirectory="jboss-cache-testsuite"
testResults="checkout/jboss-cache-testsuite/output/reports/html/TESTS-TestSuites.xml"
cvsbranch="HEAD"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="dev...@jb...,qa...@jb..."
jbossdir="jboss-cache-testsuite"
skipusers="true">
@@ -317,7 +317,7 @@
logbuilddirectory="jboss-cache-testsuite-140"
testResults="checkout/jboss-cache-testsuite-140/output/reports/html/TESTS-TestSuites.xml"
cvsbranch="Branch_JBossCache_1_4_0"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="dev...@jb...,qa...@jb..."
jbossdir="jboss-cache-testsuite-140"
skipusers="true">
@@ -427,7 +427,7 @@
timeout="7200"
logbuilddirectory="jboss-seam-testsuite"
testResults="scripts/logbuild/jboss-seam-testsuite/results/tests/Core.xml"
- emailFailureTo="jbo...@li..."
+ emailFailureTo="jbo...@li..."
emailAlwaysTo="qa...@jb..."
jbossdir="jboss-seam-testsuite">
</project>
|
|
From: Kabir K. <kk...@jb...> - 2006-07-10 19:09:30
|
User: kkhan
Date: 06/07/10 15:09:29
Modified: src/main/org/jboss/aop ClassicWeavingStrategy.java
SuperClassesFirstWeavingStrategy.java
Log:
Call CtCLass.debugWriteFile() if jboss.aop.debug.classes is set to true
Revision Changes Path
1.5 +5 -0 jboss-aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClassicWeavingStrategy.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ClassicWeavingStrategy.java 22 Jun 2006 14:15:17 -0000 1.4
+++ ClassicWeavingStrategy.java 10 Jul 2006 19:09:29 -0000 1.5
@@ -107,6 +107,11 @@
if (transformed)
{
pool.lockInCache(clazz);
+ if (AspectManager.debugClasses)
+ {
+ clazz.debugWriteFile();
+ }
+
byte[] rtn = clazz.toBytecode();
if (AspectManager.prune) clazz.prune();
return rtn;
1.6 +4 -0 jboss-aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SuperClassesFirstWeavingStrategy.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SuperClassesFirstWeavingStrategy.java 24 Jun 2006 13:51:20 -0000 1.5
+++ SuperClassesFirstWeavingStrategy.java 10 Jul 2006 19:09:29 -0000 1.6
@@ -65,6 +65,10 @@
if (clazz != null)
{
pool.lockInCache(info.getClazz());
+ if (AspectManager.debugClasses)
+ {
+ info.getClazz().debugWriteFile();
+ }
byte[] rtn = info.getClazz().toBytecode();
if (AspectManager.prune) info.getClazz().prune();
return rtn;
|
|
From: Kabir K. <kk...@jb...> - 2006-07-10 19:07:53
|
User: kkhan
Date: 06/07/10 15:07:49
Modified: src/main/org/jboss/aop/ant AopC.java
Log:
Add jvm attribute to aopc task
Revision Changes Path
1.16 +18 -1 jboss-aop/src/main/org/jboss/aop/ant/AopC.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AopC.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/ant/AopC.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- AopC.java 15 Mar 2006 20:59:33 -0000 1.15
+++ AopC.java 10 Jul 2006 19:07:49 -0000 1.16
@@ -43,7 +43,7 @@
* Ant task. Copied a bunch of shit from javac task
*
* @author <a href="mailto:bi...@jb...">Bill Burke</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class AopC extends MatchingTask
{
@@ -54,6 +54,7 @@
private int maxSrc = 1000;
private String instrumentor;
+ private String jvm;
private Path classpath;
private Path aoppath;
private Path aopclasspath;
@@ -117,6 +118,16 @@
return report;
}
+ public String getJvm()
+ {
+ return jvm;
+ }
+
+ public void setJvm(String jvm)
+ {
+ this.jvm = jvm;
+ }
+
public void setOptimized(boolean optimized)
{
this.optimized = optimized;
@@ -295,6 +306,7 @@
throws BuildException
{
CommandlineJava cmd = new CommandlineJava();
+
if (verbose)
cmd.createArgument().setValue("-verbose");
if (suppress)
@@ -314,12 +326,17 @@
cmd.createArgument().setValue(aopclasspath.toString());
}
logAndAddFilesToCompile(cmd);
+
try
{
// Create an instance of the compiler, redirecting output to
// the project log
classpath.append(compilerClasspath);
Java java = (Java) (getProject().createTask("java"));
+ if (jvm != null && jvm.length() > 0)
+ {
+ java.setJvm(jvm);
+ }
if (getClasspath() != null)
{
getProject().log("using user supplied classpath: "
|
|
From: Kabir K. <kk...@jb...> - 2006-07-10 19:07:52
|
User: kkhan
Date: 06/07/10 15:07:48
Modified: jboss-aop build-tests-jdk14.xml
Log:
Add jvm attribute to aopc task
Revision Changes Path
1.2 +11 -11 jboss-aop/build-tests-jdk14.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build-tests-jdk14.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/build-tests-jdk14.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build-tests-jdk14.xml 10 Jul 2006 15:00:22 -0000 1.1
+++ build-tests-jdk14.xml 10 Jul 2006 19:07:48 -0000 1.2
@@ -14,7 +14,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build-tests-jdk14.xml,v 1.1 2006/07/10 15:00:22 kkhan Exp $ -->
+<!-- $Id: build-tests-jdk14.xml,v 1.2 2006/07/10 19:07:48 kkhan Exp $ -->
<project default="main" name="JBoss/AOP">
@@ -228,10 +228,9 @@
<!-- ================================================================== -->
<!-- Clean up all build output -->
- <target name="clean"
- description="Cleans up most generated files."
- depends="_buildmagic:clean">
+ <target name="clean" description="Cleans up most generated files." depends="init">
<delete dir="${build.tests.classes}"/>
+ <delete dir="${build.tests.retro}"/>
</target>
<target name="clean-tests" depends="init">
@@ -267,19 +266,19 @@
<!-- ==================================================================================== -->
<target name="tests" depends="main">
- <delete dir="${build.tests.classes}"/>
+ <antcall target="clean"/>
<antcall target="bootclasspath-genadvisor-tests" inheritRefs="true"/>
<antcall target="bootclasspath-tests" inheritRefs="true"/>
<antcall target="system-classloader-test" inheritRefs="true"/>
<antcall target="not-woven-tests" inheritRefs="true"/>
- <delete dir="${build.tests.classes}"/>
+ <antcall target="clean"/>
<antcall target="precompiled-tests" inheritRefs="true"/>
- <delete dir="${build.tests.classes}"/>
+ <antcall target="clean"/>
<antcall target="precompiled-genadvisor-tests" inheritRefs="true"/>
- <delete dir="${build.tests.classes}"/>
+ <antcall target="clean"/>
<antcall target="non-optimized-precompiled-tests" inheritRefs="true"/>
</target>
@@ -474,6 +473,7 @@
<jvmarg value="${jboss.aop.class.path}"/>
<jvmarg value="${jboss.aop.path}"/>
<sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
+ <sysproperty key="jboss.aop.debug.classes" value="true"/>
<formatter type="plain" extension="-${caller}.txt"/>
<formatter type="xml" extension="-${caller}.xml"/>
<classpath>
@@ -738,7 +738,7 @@
<echo>Compiling ${test} with optimized=${optimized} and instrumentor ${instrumentor}</echo>
<!-- aopc -->
- <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath">
+ <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath" jvm="${java14}">
<classpath refid="aop.task.classpath"/>
<classpath refid="test.classpath"/>
<classpath path="${build.tests.retro}"/>
@@ -871,7 +871,7 @@
<echo message="aoppath=${aoppath}"/>
<!-- aopc -->
- <aopc compilerclasspathref="aop.task.classpath">
+ <aopc compilerclasspathref="aop.task.classpath" jvm="${java14}">
<classpath refid="aop.task.classpath"/>
<classpath refid="test.classpath"/>
<classpath path="${build.tests.retro}"/>
@@ -979,7 +979,7 @@
<property name="testcase" value="org.jboss.test.aop.${test}.${case}"/>
- <aopc compilerclasspathref="aop.task.classpath">
+ <aopc compilerclasspathref="aop.task.classpath" jvm="${java14}">
<classpath refid="aop.task.classpath"/>
<classpath refid="test.classpath"/>
<classpath path="${build.tests.retro}"/>
|
|
From: Roy R. <ru...@jb...> - 2006-07-10 19:06:44
|
User: russo
Date: 06/07/10 15:06:39
Modified: referenceGuide/en/modules xmldescriptors.xml
Log:
updated links to pswap resources
Revision Changes Path
1.24 +2 -2 jboss-portal-docs/referenceGuide/en/modules/xmldescriptors.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: xmldescriptors.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal-docs/referenceGuide/en/modules/xmldescriptors.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- xmldescriptors.xml 6 Jul 2006 16:38:50 -0000 1.23
+++ xmldescriptors.xml 10 Jul 2006 19:06:39 -0000 1.24
@@ -469,7 +469,7 @@
can download
here:
<ulink
- url="http://anonsvn.jboss.org/repos/portletswap/portlets/bundles/HelloWorldPortalPage.zip"
+ url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorldPortalPage.zip"
>HelloWorld Page</ulink>
.
</para>
@@ -641,7 +641,7 @@
<para>To illustrate our example, we have made available a portlet that you can download
here:
<ulink
- url="http://anonsvn.jboss.org/repos/portletswap/portlets/bundles/HelloWorldPortal.zip"
+ url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_4/bundles/HelloWorldPortal.zip"
>HelloPortal</ulink>
.
</para>
|
|
From: Roy R. <ru...@jb...> - 2006-07-10 18:53:23
|
User: russo
Date: 06/07/10 14:53:21
Modified: samples/src/main/org/jboss/samples/portlet/news
NewsPortlet.java
Log:
JBPORTAL-941 - added error handling for no net access.
Revision Changes Path
1.5 +4 -4 jboss-portal/samples/src/main/org/jboss/samples/portlet/news/NewsPortlet.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewsPortlet.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/samples/src/main/org/jboss/samples/portlet/news/NewsPortlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsPortlet.java 11 Jun 2006 21:44:48 -0000 1.4
+++ NewsPortlet.java 10 Jul 2006 18:53:21 -0000 1.5
@@ -179,8 +179,10 @@
}
catch(Exception e)
{
- log.error("Fatal Error reading/parsing XML Source.");
- throw new PortletException(e);
+ log.error("Fatal Error reading/parsing XML Source.",e);
+ PrintWriter writer = response.getWriter();
+ writer.write("Failed to retrieve News Feed!");
+ writer.close();
}
finally // close all streams
{
@@ -239,8 +241,6 @@
}
}
- // TODO: error checking for URL
-
//store as the selected xml so that it shows up selected as displays
response.setRenderParameter("newurl", newURL);
|
|
From: Roy R. <ru...@jb...> - 2006-07-10 18:53:22
|
User: russo
Date: 06/07/10 14:53:21
Modified: samples/src/main/org/jboss/samples/portlet/weather
WeatherPortlet.java
Log:
JBPORTAL-941 - added error handling for no net access.
Revision Changes Path
1.2 +4 -2 jboss-portal/samples/src/main/org/jboss/samples/portlet/weather/WeatherPortlet.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WeatherPortlet.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/samples/src/main/org/jboss/samples/portlet/weather/WeatherPortlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- WeatherPortlet.java 24 Jan 2006 20:46:19 -0000 1.1
+++ WeatherPortlet.java 10 Jul 2006 18:53:21 -0000 1.2
@@ -161,8 +161,10 @@
}
catch(Exception e)
{
- log.error("Fatal Error reading/parsing XML Source.");
- throw new PortletException(e);
+ log.error("Fatal Error reading/parsing XML Source.",e);
+ PrintWriter writer = response.getWriter();
+ writer.write("Failed to retrieve Weather Feed!");
+ writer.close();
}
finally // close all streams
{
|
|
From: Robert S. <ra...@gm...> - 2006-07-10 18:49:29
|
User: rawb
Date: 06/07/10 14:49:27
Removed: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory
AopModuleFactory.java EjbModuleFactory.java
EarModuleFactory.java WarModuleFactory.java
Log:
Factories Removed
|
|
From: Robert S. <ra...@gm...> - 2006-07-10 18:49:10
|
User: rawb
Date: 06/07/10 14:49:08
Removed: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime
JBossRuntimeConfiguration.java
Log:
Class removed (JBossRuntimeConfiguration)
|
|
From: Robert S. <ra...@gm...> - 2006-07-10 18:48:49
|
User: rawb
Date: 06/07/10 14:48:47
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server
ServerStateChecker.java
Log:
Viewer updating
Revision Changes Path
1.7 +1 -0 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerStateChecker.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ServerStateChecker.java 10 Jul 2006 15:46:18 -0000 1.6
+++ ServerStateChecker.java 10 Jul 2006 18:48:47 -0000 1.7
@@ -103,6 +103,7 @@
// and return true or generate an exception
}
//System.out.println("Results at time " + current + ": " + twiddleResults);
+ ent.getEventLog().branchChanged();
}
if( canceled ) {
|
|
From: Robert S. <ra...@gm...> - 2006-07-10 18:09:38
|
User: rawb
Date: 06/07/10 14:09:33
Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui
JBossServerUIPlugin.java
Log:
Extensions not initialized properly. * Fixed
Revision Changes Path
1.11 +3 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossServerUIPlugin.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- JBossServerUIPlugin.java 10 Jul 2006 15:51:25 -0000 1.10
+++ JBossServerUIPlugin.java 10 Jul 2006 18:09:33 -0000 1.11
@@ -139,8 +139,6 @@
// Am I enabled?
Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
String key = EXTENSION_ENABLED + getId();
- enabled = prefs.contains(key) ? prefs.getBoolean(key) : false;
- ASDebug.p("id " + key + " is " + prefs.getBoolean(key), this);
Bundle pluginBundle = JBossServerUIPlugin.getDefault().getBundle();
try {
@@ -148,6 +146,9 @@
ImageDescriptor.createFromURL(pluginBundle.getEntry(getIconLocation()));
} catch( Exception e ) {
}
+
+ setEnabled( prefs.contains(key) ? prefs.getBoolean(key) : false );
+
}
public String getId() {
|
|
From: Clebert S. <csu...@jb...> - 2006-07-10 18:09:33
|
User: csuconic
Date: 06/07/10 14:09:29
Modified: tests/org/jboss/serial/regression/jbser83
RegressionTestCase.java
Log:
JBSER-83 - adding assertion on testcase
Revision Changes Path
1.2 +2 -0 jboss-serialization/tests/org/jboss/serial/regression/jbser83/RegressionTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegressionTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-serialization/tests/org/jboss/serial/regression/jbser83/RegressionTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RegressionTestCase.java 10 Jul 2006 16:03:35 -0000 1.1
+++ RegressionTestCase.java 10 Jul 2006 18:09:29 -0000 1.2
@@ -20,6 +20,7 @@
ObjectInputStream input = new ObjectInputStream(new ByteArrayInputStream(byteOut.toByteArray()));
Object obj = input.readObject();
+ assertNull(obj);
System.out.println("obj=" + obj);
}
@@ -47,6 +48,7 @@
objOut.close();
ObjectInputStream input = new JBossObjectInputStream(new ByteArrayInputStream(byteOut.toByteArray()));
Object obj = input.readObject();
+ assertNull(obj);
System.out.println("obj=" + obj);
}
|
|
From: Robert S. <ra...@gm...> - 2006-07-10 17:43:00
|
User: rawb
Date: 06/07/10 13:42:57
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory
ArchiveModuleFactory.java
Log:
Forced a cache refresh on ModuleFactory. Fixed a bug reported by a user (not in JIRA)
Revision Changes Path
1.2 +11 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/ArchiveModuleFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ArchiveModuleFactory.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/ArchiveModuleFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ArchiveModuleFactory.java 10 Jul 2006 15:45:09 -0000 1.1
+++ ArchiveModuleFactory.java 10 Jul 2006 17:42:57 -0000 1.2
@@ -9,15 +9,20 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.internal.ModuleFactory;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.client.verifiers.ArchiveVerifier;
+import org.jboss.ide.eclipse.as.core.util.ASDebug;
public class ArchiveModuleFactory extends JBossModuleFactory {
private static String GENERIC_JAR = "jboss.archive";
private static String VERSION = "1.0";
+ private static final String FACTORY_ID = "org.jboss.ide.eclipse.as.core.ArchiveDeployer";
+
public ArchiveModuleFactory() {
}
@@ -43,7 +48,12 @@
pathToModule.put(path, module);
moduleToDelegate.put(module, delegate);
- return module; }
+ // ensure the factory clears its cache
+ ServerPlugin.findModuleFactory(FACTORY_ID).clearModuleCache();
+
+ return module;
+
+ }
public Object getLaunchable(JBossModuleDelegate delegate) {
return new ArchiveVerifier(delegate);
|
|
From: Roy R. <ru...@jb...> - 2006-07-10 17:30:19
|
User: russo
Date: 06/07/10 13:30:17
Modified: referenceGuide/en/modules migration.xml
Log:
JBPORTAL-933 - done
Revision Changes Path
1.13 +247 -188 jboss-portal-docs/referenceGuide/en/modules/migration.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: migration.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal-docs/referenceGuide/en/modules/migration.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- migration.xml 6 Jul 2006 20:46:35 -0000 1.12
+++ migration.xml 10 Jul 2006 17:30:17 -0000 1.13
@@ -12,61 +12,64 @@
</author>
</chapterinfo>
<title>Upgrading 2.2 - 2.4</title>
- <warning>The migration application is not complete, as of the time of this document writing. It is suggested, users
- wait before attempting to migrate their data using this application.</warning>
- <para>This chapter addresses migration issues from version 2.2 to 2.4 of JBoss Portal. TODO...</para>
+ <para>This chapter addresses migration issues from version 2.2 to 2.4 of JBoss Portal.</para>
<sect1 id="migrating_database">
- <title>Migrating Database</title>
+ <title>Migrating the Database</title>
<para>JBoss Portal 2.4 comes with dedicated web application for database migration.
- This tool is designed to provide maximum ease of use to make migration process fast and pleasant.
+ This application will migrate your existing JBoss Portal 2.2 database data to a new one, for use with JBoss
+ Portal 2.4.
</para>
- <para>The migration process should be performed
+ <warning>This migration process should be performed
<emphasis role="bold">before</emphasis>
- JBoss Portal 2.4 deployment
- </para>
+ JBoss Portal 2.4 deployment.
+ <emphasis role="bold">Follow the exact steps below, in order, or ugly scary things may happen!</emphasis>
+ </warning>
<sect2 id="migration_preparations">
- <title>Preparing Database</title>
- <para>Migration process occures between two databases:</para>
+ <title>Database Requirements/Preparation</title>
+ <para>You will need two database instances for this migration process to function:</para>
<itemizedlist>
<listitem>
<para>
<emphasis role="bold">Source JBP 2.2 database</emphasis>
- from which we migrate portal data
+ from which we migrate portal data. (You should already have this!)
</para>
</listitem>
<listitem>
<para>
<emphasis role="bold">Destination JBP 2.4 database</emphasis>
- to which we migrate portal data
+ to which we migrate portal data.
</para>
</listitem>
</itemizedlist>
- <para>Before you begin the process you must create separate database to which the data
- will be migrated. Note that Migration Application performs Hibernate SchemaExport which
- drops and recreates tables - It is alway recommended that you backup your database before start!!!</para>
- <para>For scope of examples presented in this chapter lets assume we use MySQL database and have:</para>
+ <para>Before you begin the process you must create a separate database to which the data
+ will be migrated. Note that the Migration Application performs a Hibernate SchemaExport which
+ drops and recreates tables - It is recommended that you backup your database before starting!</para>
+ <para>For our example, we have two databases... the existing one for JBoss Portal 2.2, and the new (empty) one
+ for JBoss Portal 2.4:
<itemizedlist>
<listitem>
<para>
- JBoss Portal 2.2 database called
+ JBoss Portal 2.2 DB:
<emphasis role="bold">jbossportal22</emphasis>
- which contains our production data
</para>
</listitem>
<listitem>
<para>
- Newly created database called
+ JBoss Portal 2.4 DB:
<emphasis role="bold">jbossportal24</emphasis>
- to which we want to migrate our data and deploy JBoss Portal 2.4 on it.
</para>
</listitem>
</itemizedlist>
+ We will use the above database naming, as examples in the next chapter on configuring the datasource.
+ </para>
</sect2>
<sect2 id="datasource_prepare">
- <title>Preparing Datasources</title>
- <para>To point Migration Application from and to where it should migrate data we use
- JBoss Application Server datasource files.</para>
- <para>For your normal JBoss Portal 2.2 deployment you probably have
+ <title>DataSource Requirements/Preparation</title>
+ <para>The Migration Application will need access to both databases, while its running. For this reason, we need
+ to make available both JBoss Application Server datasource files.</para>
+ <orderedlist>
+ <listitem>
+ <para>You should have an existing JBoss Portal 2.2 datasource,
<emphasis role="bold">portal-ds.xml</emphasis>
or
<emphasis role="bold">portal-*-ds.xml</emphasis>
@@ -86,8 +89,10 @@
</datasources>
]]>
</programlisting>
- <para>You need to create a second datasource to be able to point Migration App. to the
- destination database. In our case we can create
+ </listitem>
+ <listitem>
+ <para>Now, you will need to create a second datasource for the destination database. In our example we
+ will create,
<emphasis role="bold">portal-migration-ds.xml</emphasis>
file that looks like this:
</para>
@@ -105,28 +110,18 @@
</datasources>
]]>
</programlisting>
- <para>Both files should be placed in
- <emphasis role="bold">server/default/deploy</emphasis>
- directory of the application server on which you plan to deploy migration application.
- </para>
+ </listitem>
+ </orderedlist>
</sect2>
<sect2 id="getting_tool">
- <title>Obtaining Migration Application</title>
- <para>Portal Migration Application can be obtained either as ready to deploy web application or builded from
- source.</para>
+ <title>Obtaining the Migration Application</title>
+ <para>The JBoss Portal Migration Application can be obtained either as a ready to deploy web application or in source form.</para>
<sect3 id="getting_app_binary">
<title>Downloading binary</title>
- <para>You can find prepared binaries at:</para>
+ <para>You can find a prepared binary at:</para>
<itemizedlist>
<listitem>
<para>
- <ulink url="http://www.portletswap.com">PortletSwap</ulink>
- - the place you can find many
- ready portlets
- </para>
- </listitem>
- <listitem>
- <para>
<ulink url="http://labs.jboss.com/portal/jbossportal/download">Download</ulink>
section of JBoss Portal project page
</para>
@@ -175,7 +170,7 @@
<para>Deployable web application archive can be found at
<emphasis role="bold">jboss-portal-2.4/migration/output/lib/portal-migration.war</emphasis>
</para>
- <para>You can also deploy it automaticly by executing:</para>
+ <para>You can also deploy it automatically by executing:</para>
<programlisting>
<![CDATA[
cd jboss-portal-2.4
@@ -185,18 +180,49 @@
</programlisting>
</sect3>
</sect2>
+ <sect2 id="deploying_migration">
+ <title>Deploying the Migration Application</title>
+ <para>
+ The steps below will guide you through deploying and running the migration application:
+ <orderedlist>
+ <listitem>
+ <para>Shut down JBoss Application Server</para>
+ </listitem>
+ <listitem>
+ <para>Undeploy/Remove JBoss Portal 2.2 (JBOSS_HOME/server/default/deploy/jboss-portal.sar)</para>
+ </listitem>
+ <listitem>
+ <para>Delete
+ <emphasis>JBOSS_HOME/server/default/data/portal/cms</emphasis>
+ (This directory will be created for you, once again, when JBoss Portal 2.4 initializes.
+ </para>
+ </listitem>
+ <listitem>
+ <para>Deploy the
+ <emphasis role="bold">two</emphasis>
+ necessary datasource descriptors, from
+ <xref linkend="datasource_prepare"/> to JBOSS_HOME/server/default/deploy/*
+ </para>
+ </listitem>
+ <listitem>
+ <para>Deploy the Migration Application, you obtained from
+ <xref linkend="getting_tool"/> to JBOSS_HOME/server/default/deploy/portal-migration.war
+ </para>
+ </listitem>
+ <listitem>
+ <para>Start JBoss Application Server</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </sect2>
<sect2 id="running_migration">
- <title>Running Migration Application</title>
- <mediaobject>
- <imageobject>
- <imagedata align="center" valign="middle" fileref="images/migration/migration_app_1.jpg"/>
- </imageobject>
- </mediaobject>
+ <title>Running the Migration Application</title>
+ <orderedlist>
+ <listitem>
<para>After deploying Migration Application you can access it at
- <emphasis role="bold">http://localhost:8080/portal-migration</emphasis>
+ <ulink url="http://localhost:8080/portal-migration">http://localhost:8080/portal-migration</ulink>
. It is
password protected so you need to specify:
- </para>
<itemizedlist>
<listitem>
<para>
@@ -211,122 +237,158 @@
</para>
</listitem>
</itemizedlist>
- <para>Password can be changed in
+ <note>The Password can be changed in
<emphasis role="bold">portal-migration.war/WEB-INF/classes/users.properties</emphasis>
- file. Remember to always change the password to less trivial one or undeploy the war file after migration
+ file. Remember to always change the password to a less trivial one, or undeploy the war file after
+ the
+ migration
process.
- Otherwise someone can later have unprotected access to application that can wipe out your database tables...
+ </note>
</para>
- <para>If you logged in successfully you should access this page:</para>
+ </listitem>
+ <listitem>
+ <para>If you logged in successfully you should access this page:
<mediaobject>
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_3.jpg"/>
</imageobject>
</mediaobject>
+ </para>
+ </listitem>
+ <listitem>
<para>At
<emphasis role="bold">Step 2: 2.4 Database Connectivity Check</emphasis>
you need to provide datasouce name
that points to JBoss Portal 2.4 database (the destination one)
- </para>
+
<mediaobject>
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_4.jpg"/>
</imageobject>
</mediaobject>
+ </para>
+ </listitem>
+ <listitem>
<para>
<emphasis role="bold">Step 3: Create Tables</emphasis>
- </para>
+
<mediaobject>
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_5.jpg"/>
</imageobject>
</mediaobject>
+ </para>
+ </listitem>
+ <listitem>
<para>If both connections were valid and database schema was created successfully you can
- follow with the migration process. It is separated into following parts:</para>
+ follow with the migration process. It is separated into following parts:
<itemizedlist>
<listitem>
<para>
- <emphasis role="bold">CMD Data Migration</emphasis>
- - migrates portal builtin CMS tables content
- </para>
+ <emphasis role="bold">CMS Data Migration</emphasis>
+ - migrates portal CMS tables content
+
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_6.jpg"/>
</imageobject>
+ </para>
</listitem>
<listitem>
<para>
<emphasis role="bold">User/Role Data Migrate</emphasis>
- migrates portal user, roles and
relations beetween them
- </para>
+
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_7.jpg"/>
</imageobject>
+ </para>
</listitem>
<listitem>
<para>
<emphasis role="bold">Portal Object Data Migrate</emphasis>
- migrates
whole portal objects structure. This means nodes like portals, pages and windows.
- </para>
+
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_8.jpg"/>
</imageobject>
+ </para>
</listitem>
<listitem>
<para>
<emphasis role="bold">Portal Portlet Instance Data Migrate</emphasis>
- migrates
all portlet instances presented in portal. For each portlet instance its preferences are also
- persisted. Next all already migrated users are iterated and user preferences related to portlet
+ persisted. Next, all already migrated users are iterated and user preferences related to
+ portlet
instance are migrated
- </para>
+
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_9.jpg"/>
</imageobject>
+ </para>
</listitem>
<listitem>
<para>
<emphasis role="bold">Portal Security Data Migrate</emphasis>
- migrates security data for portal
objects and portlet instances.
- </para>
+
<imageobject>
- <imagedata align="center" valign="middle" fileref="images/migration/migration_app_10.jpg"/>
+ <imagedata align="center" valign="middle"
+ fileref="images/migration/migration_app_10.jpg"/>
</imageobject>
+ </para>
</listitem>
</itemizedlist>
- <para>Which all should lead to successfull end :)</para>
+ </para>
+ <para>Which should lead to a successfull end :)
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_11.jpg"/>
</imageobject>
- </sect2>
- <sect2 id="migration_fail">
- <title>Migration failed...</title>
- <para>If any error occure during migration process you will be provided
- with specific information and enabled to retry that step</para>
+ </para>
+ </listitem>
+ </orderedlist>
+ <para>
+ <note>If any error occured during the migration process you will be provided
+ with specific information and asked to retry that step
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_9-fail.jpg"/>
</imageobject>
<imageobject>
<imagedata align="center" valign="middle" fileref="images/migration/migration_app_10-fail.jpg"/>
</imageobject>
- <para>Always check Application Server console output or logs after migration to track possible fail
- cause.</para>
+ Always check the Application Server console output or logs after migration to track possible
+ errors.
+ </note>
+ </para>
</sect2>
<sect2 id="migration_final">
<title>Final steps</title>
- <para>After running Migration Application you need some additional steps to
- finish migration process:</para>
- <itemizedlist>
+ <para>After running the Migration Application you need to perform some additional steps to
+ finish the process:</para>
+ <orderedlist>
+ <listitem>
+ <para>Shutdown JBoss Application Server</para>
+ </listitem>
<listitem>
<para>
- Undeploy JBoss Portal 2.2
+ Undeploy JBoss Portal 2.2 (jboss-portal.sar)
+ </para>
+ </listitem>
+ <listitem>
+ <para>Undeploy the JBoss Portal 2.2 deployment descriptor</para>
+ </listitem>
+ <listitem>
+ <para>Delete
+ <emphasis>JBOSS_HOME/server/default/data/portal/cms</emphasis>
+ (This directory will be created for you, once again, when JBoss Portal 2.4 initializes.
</para>
</listitem>
<listitem>
<para>
- Edit you datasource files and set up the one pointing to newly migrated 2.4 database to have:
+ Edit your 2.4 datasource file and modify the jndi name:
<emphasis role="bold">
<![CDATA[<jndi-name>PortalDS</jndi-name>]]>
</emphasis>
@@ -334,16 +396,13 @@
</listitem>
<listitem>
<para>
- Deploy JBoss Portal 2.4
+ Deploy JBoss Portal 2.4.
</para>
</listitem>
- </itemizedlist>
- </sect2>
- <sect2 id="possible_problems">
- <title>Possible Issues</title>
- <para>Migration Application uses JBoss Portal model classes and is based on
- hibernate. Every database supported by hibernate should be valid for migration.</para>
- <para>TODO...</para>
+ <listitem>
+ <para>Start JBoss Application Server</para>
+ </listitem>
+ </orderedlist>
</sect2>
</sect1>
<sect1 id="descriptors_migration">
|
|
From: Scott S. <sco...@jb...> - 2006-07-10 17:05:22
|
User: starksm
Date: 06/07/10 13:05:16
Added: src/main/org/jboss/system/server/profileservice
VFSDeploymentScannerImpl.java
Log:
A deployment scanner that integrates with the VFS and ProfileService
Revision Changes Path
1.1 date: 2006/07/10 17:05:16; author: starksm; state: Exp;system2/src/main/org/jboss/system/server/profileservice/VFSDeploymentScannerImpl.java
Index: VFSDeploymentScannerImpl.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.system.server.profileservice;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
import org.jboss.deployers.spi.Deployment;
import org.jboss.deployers.spi.MainDeployer;
import org.jboss.deployment.IncompleteDeploymentException;
import org.jboss.deployment.scanner.VFSDeploymentScanner;
import org.jboss.net.protocol.URLLister;
import org.jboss.net.protocol.URLLister.URLFilter;
import org.jboss.profileservice.spi.Profile;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.util.JBossObject;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.vfs.VFSFactory;
import org.jboss.vfs.spi.ReadOnlyVFS;
import org.jboss.vfs.spi.VirtualFile;
/**
* A DeploymentScanner build on top of the VFS and ProfileService. This is a
* first pass to flesh out the APIs/concepts.
*
* @author <a href="mailto:dim...@jb...">Dimitris Andreadis</a>
* @author Sco...@jb...
* @version $Revision$
*/
public class VFSDeploymentScannerImpl
extends JBossObject
implements VFSDeploymentScanner
{
// Private Data --------------------------------------------------
private MainDeployer mainDeployer;
/** The VFSFactory used to obtain deployment VFS */
private VFSFactory factory;
private ProfileService ps;
private Profile serverProfile;
private ProfileKey profileKey;
/** The URIfied ServerHomeURL */
private URI serverHomeURI;
/** The list of URIs to scan */
private List<URI> uriList = Collections.synchronizedList(new ArrayList());
/** The list of VirtualFiles to scan */
private List<VirtualFile> vdfList = Collections.synchronizedList(new ArrayList());
/** Allow a filter for scanned directories */
private URLLister.URLFilter filter;
/** Whether to search for files inside directories whose names containing no dots */
private boolean doRecursiveSearch = true;
/** A set of scanned VirtualFiles which have been deployed */
private Set deployedSet = Collections.synchronizedSet(new HashSet());
/** Remember the last exception for reporting */
private IncompleteDeploymentException lastIncompleteDeploymentException;
// Constructor ---------------------------------------------------
public VFSDeploymentScannerImpl()
{
// empty
}
// Attributes ----------------------------------------------------
public void setMainDeployer(MainDeployer deployer)
{
this.mainDeployer = deployer;
this.factory = mainDeployer.getVFSFactory();
}
/**
* @return Returns the factory.
*/
public VFSFactory getVFSFactory()
{
return this.factory;
}
/**
* @param factory The factory to set.
*/
public void setVFSFactory(VFSFactory factory)
{
this.factory = factory;
}
public void setProfileService(ProfileService ps)
{
this.ps = ps;
}
public ProfileService getProfileService()
{
return ps;
}
public ProfileKey getProfileKey()
{
return profileKey;
}
public void setProfileKey(ProfileKey key)
{
this.profileKey = key;
}
/* (non-Javadoc)
* @see org.jboss.deployment.scanner.VFSDeploymentScanner#getScanPeriod()
*/
public long getScanPeriod()
{
// TODO Auto-generated method stub
return 0;
}
/* (non-Javadoc)
* @see org.jboss.deployment.scanner.VFSDeploymentScanner#isScanEnabled()
*/
public boolean isScanEnabled()
{
// TODO Auto-generated method stub
return false;
}
/* (non-Javadoc)
* @see org.jboss.deployment.scanner.VFSDeploymentScanner#setScanEnabled(boolean)
*/
public void setScanEnabled(boolean flag)
{
// TODO Auto-generated method stub
}
/* (non-Javadoc)
* @see org.jboss.deployment.scanner.VFSDeploymentScanner#setScanPeriod(long)
*/
public void setScanPeriod(long period)
{
// TODO Auto-generated method stub
}
/**
* @throws URISyntaxException
* @throws IOException
*/
public void setURIs(final String listspec) throws URISyntaxException, IOException
{
if (listspec == null)
{
throw new NullPointerException("listspec argument cannot be null");
}
List<URI> list = new LinkedList<URI>();
StringTokenizer stok = new StringTokenizer(listspec, ",");
while (stok.hasMoreTokens())
{
String urispec = stok.nextToken().trim();
log.debug("Adding URI from spec: " + urispec);
URI uri = makeURI(urispec);
log.debug("URI: " + uri);
list.add(uri);
}
setURIList(list);
}
/**
*
* @throws IOException
*/
public void setURIList(final List<URI> list) throws IOException
{
if (list == null)
{
throw new NullPointerException("list argument cannot be null");
}
// start out with a fresh list
uriList.clear();
for(int n = 0; n < list.size(); n ++)
{
URI uri = list.get(n);
if (uri == null)
{
throw new IllegalArgumentException("list element["+n+"] is null");
}
addURI(uri);
}
log.debug("URI list: " + uriList);
}
/**
* @jmx:managed-attribute
*/
public List<URI> getURIList()
{
return new ArrayList<URI>(uriList);
}
/**
* @jmx:managed-attribute
*/
public void setRecursiveSearch(boolean recurse)
{
doRecursiveSearch = recurse;
}
/**
* @jmx:managed-attribute
*/
public boolean getRecursiveSearch()
{
return doRecursiveSearch;
}
/**
* @jmx:managed-attribute
*/
public void setFilter(String classname)
throws ClassNotFoundException, IllegalAccessException, InstantiationException
{
Class filterClass = Thread.currentThread().getContextClassLoader().loadClass(classname);
filter = (URLLister.URLFilter)filterClass.newInstance();
}
/**
* @jmx:managed-attribute
*/
public String getFilter()
{
if (filter == null)
{
return null;
}
return filter.getClass().getName();
}
/**
* @jmx:managed-attribute
*/
public void setFilterInstance(URLFilter filter)
{
this.filter = filter;
}
/**
* @jmx:managed-attribute
*/
public URLFilter getFilterInstance()
{
return filter;
}
// Operations ----------------------------------------------------
/**
* @jmx:managed-operation
*/
public void addURI(final URI uri) throws IOException
{
if (uri == null)
{
throw new NullPointerException("uri argument cannot be null");
}
if( uriList.add(uri) == true )
{
log.debug("Added URI: " + uri);
if (factory != null)
{
URL rootURL = uri.toURL();
ReadOnlyVFS vfs = factory.getVFS(rootURL);
VirtualFile vf = vfs.resolveFile("");
vdfList.add(vf);
}
}
}
/**
* @jmx:managed-operation
*/
public void removeURI(final URI uri)
throws IOException
{
if (uri == null)
{
throw new NullPointerException("uri argument cannot be null");
}
if (factory != null)
{
VirtualFile vf = getVFforURI(uri);
vdfList.remove(vf);
}
boolean success = uriList.remove(uri);
if (success)
{
log.debug("Removed URI: " + uri);
}
}
/**
* @jmx:managed-operation
*/
public boolean hasURI(final URI uri)
{
if (uri == null)
{
throw new NullPointerException("uri argument cannot be null");
}
return uriList.contains(uri);
}
public void start() throws Exception
{
// synchronize uriList and vdfList because only at this point
// setVirtualFileFactory() injection has been performed
if (factory != null)
{
vdfList.clear();
for (Iterator<URI> i = uriList.iterator(); i.hasNext(); )
{
URI uri = i.next();
VirtualFile vf = this.getVFforURI(uri);
vdfList.add(vf);
}
}
if( profileKey == null )
{
profileKey = new ProfileKey("default");
}
}
// AbstractDeploymentScanner overrides ---------------------------
public synchronized void scan() throws Exception
{
if (vdfList == null)
{
throw new IllegalStateException("not initialized");
}
boolean trace = log.isTraceEnabled();
lastIncompleteDeploymentException = null;
// Scan for deployments
if (trace)
{
log.trace("Scanning for new deployments");
}
// VirtualFiles to deploy
List<VirtualFile> toDeployList = new LinkedList<VirtualFile>();
synchronized (vdfList)
{
for (Iterator i = vdfList.iterator(); i.hasNext();)
{
VirtualFile component = (VirtualFile)i.next();
if (component.isFile())
{
// treat this as a deployable unit
toDeployList.add(component);
}
else if (component.isDirectory())
{
// process (possibly recursively) the dir
addDeployments(toDeployList, component);
}
}
}
if (trace)
{
log.trace("toDeployList");
for (Iterator i = toDeployList.iterator(); i.hasNext();)
{
log.trace(i.next());
}
}
LinkedList<VirtualFile> toRemoveList = new LinkedList<VirtualFile>();
LinkedList<VirtualFile> toCheckForUpdateList = new LinkedList<VirtualFile>();
synchronized (deployedSet)
{
// remove previously deployed URLs no longer needed
for (Iterator i = deployedSet.iterator(); i.hasNext();)
{
VirtualFile deployedComponent = (VirtualFile)i.next();
if (toDeployList.contains(deployedComponent))
{
toCheckForUpdateList.add(deployedComponent);
}
else
{
toRemoveList.add(deployedComponent);
}
}
}
// ********
// Undeploy
// ********
for (Iterator i = toRemoveList.iterator(); i.hasNext();)
{
VirtualFile deployedComponent = (VirtualFile)i.next();
undeploy(deployedComponent);
}
// ********
// Redeploy
// ********
// compute the DeployedURL list to update
ArrayList<VirtualFile> toUpdateList = new ArrayList<VirtualFile>(toCheckForUpdateList.size());
for (Iterator i = toCheckForUpdateList.iterator(); i.hasNext();)
{
VirtualFile deployedComponent = (VirtualFile)i.next();
if (isModified(deployedComponent))
{
if (trace)
{
log.trace("Re-deploying " + deployedComponent);
}
toUpdateList.add(deployedComponent);
}
}
// sort to update list
//Collections.sort(toUpdateList, sorter);
// Undeploy in order
for (int i = toUpdateList.size() - 1; i >= 0; i--)
{
VirtualFile vf = toUpdateList.get(i);
undeploy(vf);
}
// Deploy in order
for (int i = 0; i < toUpdateList.size(); i++)
{
VirtualFile vf = toUpdateList.get(i);
deploy(vf);
}
// ******
// Deploy
// ******
//Collections.sort(toDeployList, sorter);
for (Iterator i = toDeployList.iterator(); i.hasNext();)
{
VirtualFile component = (VirtualFile)i.next();
// if component is not deployed already, deploy it
if (!deployedSet.contains(component))
{
deploy(component);
}
// component must have been deployed by now, so remove it from list
i.remove();
/* Check to see if mainDeployer suffix list has changed, if so, then resort
if (i.hasNext() && updateSorter())
{
Collections.sort(toDeployList, sorter);
i = toDeployList.iterator();
}
*/
}
/* TODO: Validate that there are still incomplete deployments
if (lastIncompleteDeploymentException != null)
{
try
{
Object[] args = {};
String[] sig = {};
getServer().invoke(getDeployer(), "checkIncompleteDeployments", args, sig);
}
catch (Exception e)
{
Throwable t = JMXExceptionDecoder.decode(e);
log.error(t);
}
}
*/
}
// Private -------------------------------------------------------
/**
* A helper to make a URI from a full/partial urispec
*/
private URI makeURI(String urispec) throws URISyntaxException
{
// First replace URI with appropriate properties
urispec = StringPropertyReplacer.replaceProperties(urispec);
return serverHomeURI.resolve(urispec);
}
/**
* A helper to find all deployments under a directory component
* and add them to the supplied list.
*
* We may recurse.
*/
private void addDeployments(List<VirtualFile> list, VirtualFile root)
throws IOException
{
VirtualFile[] components = root.getChildren();
for (int i = 0; i < components.length; i++)
{
VirtualFile component = components[i];
if (component.isFile())
{
// the first arg in filter.accept is not used!
if (filter == null || filter.accept(null, component.getName()))
{
list.add(component);
}
}
else if (component.isDirectory())
{
if (component.getName().indexOf('.') == -1 && this.doRecursiveSearch)
{
// recurse if not '.' in name and recursive search is enabled
addDeployments(list, component);
}
else
{
list.add(component);
}
}
}
}
/**
* A helper to deploy the given component using the deployer.
*/
private void deploy(final VirtualFile component)
{
// If the deployer is null simply ignore the request
if (ps == null)
{
return;
}
if (log.isTraceEnabled())
{
log.trace("Deploying: " + component);
}
Deployment deployment = null;
try
{
URL componentUrl = component.toURL();
Profile profile = ps.getProfile(profileKey);
// TODO: this is wasteful. Need a way to query the profile for a deployment URL?
deployment = mainDeployer.parse(componentUrl);
if( profile.getDeployment(deployment.getName()) == null )
profile.addDeployment(deployment);
}
catch (MalformedURLException e)
{
log.warn("Cannot convert to URL", e);
return;
}
catch (Exception e)
{
log.debug("Failed to deploy: " + component, e);
}
String watchPath = getWatchURL(deployment);
VirtualFile watchComponent = null;
long deployedLastModified = -1;
try
{
if (watchPath != null)
{
watchComponent = component.findChild(watchPath);
deployedLastModified = watchComponent.getLastModified();
}
else
{
deployedLastModified = component.getLastModified();
}
}
catch (IOException e)
{
log.warn(e);
}
//component.setContext(new ComponentContext(watchComponent, deployedLastModified));
if (!deployedSet.contains(component))
{
deployedSet.add(component);
}
}
/**
* A helper to undeploy the given component using the deployer.
*/
private void undeploy(final VirtualFile component)
{
try
{
if (log.isTraceEnabled())
{
log.trace("Undeploying: " + component);
}
deployedSet.remove(component);
URL componentUrl = component.toURL();
Profile profile = ps.getProfile(profileKey);
// TODO: this is wasteful. Need a way to query the profile for a deployment URL?
Deployment deployment = mainDeployer.parse(componentUrl);
profile.removeDeployment(deployment.getName());
}
catch (Exception e)
{
log.error("Failed to undeploy: " + component, e);
}
}
/**
* Helper to get the watchURL for a deployment, if different.
* Returns null otherwise
*/
private String getWatchURL(Deployment deployment)
{
String watchPath = (String) deployment.getRootContext().getContextData().get("");
return watchPath;
}
/**
* Helper to find out if a deployed component has been modified
* TODO: How should this be implemented
*/
public boolean isModified(VirtualFile component)
{
// get the context stored with every deployed component
ComponentContext cc = null; //(ComponentContext)component.getContext();
// get modification time at the time of deployment
long deployedLastModified = cc.deployedLastModified;
// find out the current lastModified time either from
// the component or the watched component, if exists
long lastModified = (cc.watchComponent != null) ? cc.watchComponent.getLastModified()
: component.getLastModified();
return deployedLastModified != lastModified;
}
private VirtualFile getVFforURI(URI uri)
throws IOException
{
VirtualFile vf = null;
if (factory != null)
{
URL rootURL = uri.toURL();
ReadOnlyVFS vfs = factory.getVFS(rootURL);
vf = vfs.resolveFile("");
}
return vf;
}
/**
* Simple holder class to let us store extra info
* on a VirtualFile object
*/
private static class ComponentContext
{
public VirtualFile watchComponent;
public long deployedLastModified;
public ComponentContext(VirtualFile watchComponent, long deployedLastModified)
{
this.watchComponent = watchComponent;
this.deployedLastModified = deployedLastModified;
}
}
}
|
|
From: Scott S. <sco...@jb...> - 2006-07-10 17:04:39
|
User: starksm
Date: 06/07/10 13:04:37
Added: src/main/org/jboss/deployment/scanner
VFSDeploymentScanner.java
Log:
A deployment scanner that integrates with the VFS and ProfileService
Revision Changes Path
1.1 date: 2006/07/10 17:04:37; author: starksm; state: Exp;system2/src/main/org/jboss/deployment/scanner/VFSDeploymentScanner.java
Index: VFSDeploymentScanner.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.deployment.scanner;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.vfs.VFSFactory;
/**
* An interface for a VFS deployment scanner service
*
* @version $Revision$
* @author Sco...@jb...
*/
public interface VFSDeploymentScanner
{
public VFSFactory getVFSFactory();
public void setVFSFactory(VFSFactory factory);
/**
*
* @param ps
*/
void setProfileService(ProfileService ps);
public ProfileService getProfileService();
/**
* Set the scan period for the scanner.
*
* @param period - The time in milliseconds between scans.
*/
void setScanPeriod(long period);
/**
* Get the scan period for the scanner.
*
* @return The time in milliseconds between scans.
*/
long getScanPeriod();
/**
* Set the periodic scan mode enabled/disabled state. Manual scanning can
* still be performed by calling {@link #scan}.
*
* @param flag - true to enable or false to disable period based scanning.
*/
void setScanEnabled(boolean flag);
/**
* Check if period based scanning is enabled.
*
* @return True if enabled, false if disabled.
*/
boolean isScanEnabled();
/**
* Scan for deployment changes.
*
* @throws IllegalStateException Not initialized.
* @throws Exception Scan failed.
*/
void scan() throws Exception;
}
|
|
From: Scott S. <sco...@jb...> - 2006-07-10 16:45:41
|
User: starksm
Date: 06/07/10 12:45:40
Modified: src/main/org/jboss/deployers/spi DeploymentContext.java
Log:
Add a Map contextData for shared state
Revision Changes Path
1.5 +9 -2 system2/src/main/org/jboss/deployers/spi/DeploymentContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DeploymentContext.java
===================================================================
RCS file: /cvsroot/jboss/system2/src/main/org/jboss/deployers/spi/DeploymentContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- DeploymentContext.java 30 Jun 2006 20:23:06 -0000 1.4
+++ DeploymentContext.java 10 Jul 2006 16:45:39 -0000 1.5
@@ -23,7 +23,9 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
import org.jboss.util.JBossObject;
import org.jboss.vfs.spi.VirtualFile;
@@ -35,7 +37,7 @@
*
* @author <a href="mailto:dim...@jb...">Dimitris Andreadis</a>
* @author Sco...@jb...
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class DeploymentContext extends JBossObject
{
@@ -46,7 +48,7 @@
/** The list of VFS paths that form the classpath */
protected List<String> classpath = new ArrayList<String>();
protected List<DeploymentContext> subDeployments = new ArrayList<DeploymentContext>();
-
+ protected ConcurrentHashMap contextData = new ConcurrentHashMap();
/** The current state of the deployment */
protected DeploymentState state = DeploymentState.CONSTRUCTED;
@@ -64,6 +66,11 @@
return file;
}
+ public Map getContextData()
+ {
+ return contextData;
+ }
+
/**
* @return the parent context or null
*/
|
|
From: Clebert S. <csu...@jb...> - 2006-07-10 16:35:58
|
User: csuconic
Date: 06/07/10 12:35:57
Modified: src/org/jboss/serial/io JBossObjectInputStream.java
Log:
JBSER-82 - a better fix due to testcase failures on cruisecontrol
Revision Changes Path
1.17 +1 -1 jboss-serialization/src/org/jboss/serial/io/JBossObjectInputStream.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossObjectInputStream.java
===================================================================
RCS file: /cvsroot/jboss/jboss-serialization/src/org/jboss/serial/io/JBossObjectInputStream.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- JBossObjectInputStream.java 20 May 2006 01:56:06 -0000 1.16
+++ JBossObjectInputStream.java 10 Jul 2006 16:35:57 -0000 1.17
@@ -138,7 +138,7 @@
};
protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
- return getClassLoader().loadClass(desc.getName());
+ return Class.forName(desc.getName(),false,getClassLoader());
}
/** This is the old method of reading objects, always loading everything to a datacontainer*/
|
|
From: Clebert S. <csu...@jb...> - 2006-07-10 16:35:58
|
User: csuconic
Date: 06/07/10 12:35:57
Modified: src/org/jboss/serial/classmetamodel
ClassMetamodelFactory.java
Log:
JBSER-82 - a better fix due to testcase failures on cruisecontrol
Revision Changes Path
1.47 +12 -69 jboss-serialization/src/org/jboss/serial/classmetamodel/ClassMetamodelFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClassMetamodelFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-serialization/src/org/jboss/serial/classmetamodel/ClassMetamodelFactory.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- ClassMetamodelFactory.java 6 Jul 2006 16:07:59 -0000 1.46
+++ ClassMetamodelFactory.java 10 Jul 2006 16:35:57 -0000 1.47
@@ -41,7 +41,7 @@
import org.jboss.serial.util.PartitionedWeakHashMap;
/**
- * $Id: ClassMetamodelFactory.java,v 1.46 2006/07/06 16:07:59 csuconic Exp $
+ * $Id: ClassMetamodelFactory.java,v 1.47 2006/07/10 16:35:57 csuconic Exp $
* @author clebert suconic
*/
public class ClassMetamodelFactory implements ClassMetaConsts
@@ -266,67 +266,17 @@
clazz = resolver.resolveClass(clazzName);
if (clazz==null)
{
- clazz = loader.loadClass(clazzName);
+ clazz = Class.forName(clazzName,false,loader);
}
}
else
{
- clazz = loader.loadClass(clazzName);
+ clazz = Class.forName(clazzName,false,loader);
}
}
return clazz;
}
- private static Class resolveArrayByName(String clazzName,ClassResolver resolver,ClassLoader loader) throws ClassNotFoundException
- {
- return Class.forName(clazzName,true,loader);
- /*String realClassName = clazzName;
- if (realClassName.endsWith(";"))
- {
- realClassName = realClassName.substring(0,realClassName.length()-1);
- }
-
- int deep=0;
- while (realClassName.startsWith("["))
- {
- deep++;
- realClassName = realClassName.substring(1);
- }
-
- realClassName = realClassName.substring(1);
-
- Class typeArray = resolveClassByName(realClassName,resolver,loader);;
-
- int arrayDeep[] = new int[deep];
- for (int i=0;i<deep;i++)
- {
- arrayDeep[i]=1;
- }
-
- return Array.newInstance(typeArray, arrayDeep).getClass(); */
- }
-
- private static ClassMetaData loadClassMetaDataArray(String clazzName, ClassResolver resolver, ClassLoader loader, boolean checkSerializable) throws IOException, ClassNotFoundException
- {
- /*if (!clazzName.startsWith("["))
- {
- throw new RuntimeException("Not an array");
- } This is a private method. No need to do this test */
-
- Class clazz = (Class)primClasses.get(clazzName);
-
- if (clazz!=null)
- {
- return getClassMetaData(clazz,checkSerializable);
- }
- else
- {
- Class arrayType = resolveArrayByName(clazzName,resolver,loader);
- return getClassMetaData(arrayType,checkSerializable);
- }
-
- }
-
public static ClassMetaData getClassMetaData(String clazzName, ClassResolver resolver, ClassLoader loader, boolean checkSerializable) throws IOException
{
try
@@ -336,13 +286,6 @@
if (classMetadata==null)
{
- if (clazzName.startsWith("["))
- {
- classMetadata= loadClassMetaDataArray(clazzName,resolver,loader,checkSerializable);
- }
- else
- {
-
Class clazz = resolveClassByName(clazzName, resolver, loader);
if (checkSerializable && !Serializable.class.isAssignableFrom(clazz))
@@ -350,7 +293,7 @@
throw new NotSerializableException(clazz.getName());
}
classMetadata = new ClassMetaData(clazz);
- }
+
loaderMap = getLoaderMap(loader);
loaderMap.put(clazzName,classMetadata);
classMetadata = (ClassMetaData)loaderMap.get(clazzName);
@@ -366,7 +309,7 @@
{
log.debug("Rebuilding clazz due to cross Loader GC (getClassMetaData(String class, ClassLoader loader)");
}
- Class clazz = loader.loadClass(clazzName);
+ Class clazz = resolveClassByName(clazzName,resolver,loader);
loaderMap.remove(clazzName);
classMetadata = new ClassMetaData(clazz);
loaderMap.put(clazz.getName(),classMetadata);
|
|
From: Scott S. <sco...@jb...> - 2006-07-10 16:29:11
|
User: starksm
Date: 06/07/10 12:29:09
Modified: src/main/org/jboss/deployers/spi MainDeployer.java
Log:
Add a parse(URL) method.
Revision Changes Path
1.5 +7 -1 system2/src/main/org/jboss/deployers/spi/MainDeployer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MainDeployer.java
===================================================================
RCS file: /cvsroot/jboss/system2/src/main/org/jboss/deployers/spi/MainDeployer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- MainDeployer.java 6 Jul 2006 03:27:55 -0000 1.4
+++ MainDeployer.java 10 Jul 2006 16:29:09 -0000 1.5
@@ -22,6 +22,7 @@
package org.jboss.deployers.spi;
import java.net.URI;
+import java.net.URL;
import java.util.List;
import org.jboss.vfs.VFSFactory;
@@ -31,7 +32,7 @@
*
* @author <a href="mailto:dim...@jb...">Dimitris Andreadis</a>
* @author Sco...@jb...
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public interface MainDeployer
{
@@ -96,6 +97,11 @@
* @param deployURI - URI for the deployment archive
*/
public Deployment parse(URI deployURI) throws DeploymentException;
+ /**
+ * Translate a deployment archive into a Deployment instance.
+ * @param deployURL - URL for the deployment archive
+ */
+ public Deployment parse(URL deployURL) throws DeploymentException;
/**
* Deploys a component
|
|
From: Scott S. <sco...@jb...> - 2006-07-10 16:29:01
|
User: starksm
Date: 06/07/10 12:28:59
Modified: src/main/org/jboss/deployers/plugins MainDeployerImpl.java
Log:
Add a parse(URL) method.
Revision Changes Path
1.3 +22 -2 system2/src/main/org/jboss/deployers/plugins/MainDeployerImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MainDeployerImpl.java
===================================================================
RCS file: /cvsroot/jboss/system2/src/main/org/jboss/deployers/plugins/MainDeployerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MainDeployerImpl.java 6 Jul 2006 03:28:48 -0000 1.2
+++ MainDeployerImpl.java 10 Jul 2006 16:28:59 -0000 1.3
@@ -217,17 +217,37 @@
*/
public Deployment parse(URI deployURI) throws DeploymentException
{
+ URL deployURL = null;
+ try
+ {
+ deployURL = deployURI.toURL();
+ if( deployURL == null )
+ throw new DeploymentException("Failed to covert URI to URL: "+deployURI);
+ }
+ catch(IOException e)
+ {
+ throw new DeploymentException("Failed to covert URI to URL: "+deployURI, e);
+ }
+ return parse(deployURL);
+ }
+ /**
+ * Translate a deployment archive into a Deployment instance. This is the
+ * structural parse of the deployment process.
+ * @param deployURL - URL for the deployment archive
+ */
+ public Deployment parse(URL deployURL) throws DeploymentException
+ {
ReadOnlyVFS vfs = null;
try
{
- URL deployURL = deployURI.toURL();
+
vfs = factory.getVFS(deployURL);
if( vfs == null )
throw new DeploymentException("Failed to load VFS for deployURL: "+deployURL);
}
catch(IOException e)
{
- throw new DeploymentException("Failed to load VFS for deployURI: "+deployURI, e);
+ throw new DeploymentException("Failed to load VFS for deployURL: "+deployURL, e);
}
// Start with the VFS
|
|
From: Manik S. <msu...@jb...> - 2006-07-10 16:28:51
|
User: msurtani
Date: 06/07/10 12:28:50
Modified: src/org/jboss/cache/interceptors
DataGravitatorInterceptor.java
Log:
Revision Changes Path
1.17 +8 -11 JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DataGravitatorInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- DataGravitatorInterceptor.java 6 Jun 2006 10:17:14 -0000 1.16
+++ DataGravitatorInterceptor.java 10 Jul 2006 16:28:50 -0000 1.17
@@ -35,16 +35,14 @@
import java.util.Vector;
/**
- * The Data Gravitator is a type of cache loader that queries the cluster for data. Behaviourally very similar to
- * {@see ClusteredCacheLoader} which it extends, it adds on further semantics specific to data gravitation.
- * <p />
- * Optional config properties such as:
- * <ul>
- * <li>removeOnFind - defaults to true, forces all remote caches that own the data or hold backups for the data to remove that data,
- * thereby making the requesting cache the new data owner. If set to false an evict is broadcast instead of a remove, so any state
- * persisted in cache loaders will remain. This is useful if you have a shared cache loader configured.</li>
- * <li>searchBackupTrees - defaults to true, causes remote caches to search through their backup subtrees in addition to their main data trees.</li>
- * </ul>
+ * The Data Gravitator interceptor intercepts cache misses and attempts t gravitate data from other parts of the cluster.
+ *
+ * Only used if Buddy Replication is enabled. Also, the interceptor only kicks in if an {@link Option} is passed in to
+ * force Data Gravitation for a specific invocation or if <b>autoDataGravitation</b> is set to <b>true</b> when configuring
+ * Buddy Replication.
+ *
+ * See the JBoss Cache User Guide for more details on configuration options. There is a section dedicated to Buddy Replication
+ * in the Replication chapter.
*
* @author <a href="mailto:ma...@jb...">Manik Surtani (ma...@jb...)</a>
*/
@@ -107,7 +105,6 @@
{
// create node locally so I don't gravitate again
// when I do the put() call to the cluster!
- // FIXME -- need to be able to suppress gravitation!!!
createNode(true, data.backupData);
// Make sure I replicate to my buddies.
log.trace("Passing the put call locally to make sure state is persisted and ownership is correctly established.");
|
|
From: Manik S. <msu...@jb...> - 2006-07-10 16:28:51
|
User: msurtani
Date: 06/07/10 12:28:50
Modified: src/org/jboss/cache/buddyreplication BuddyManager.java
Log:
Revision Changes Path
1.34 +1 -1 JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BuddyManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- BuddyManager.java 8 Jun 2006 04:42:17 -0000 1.33
+++ BuddyManager.java 10 Jul 2006 16:28:50 -0000 1.34
@@ -111,7 +111,7 @@
enabled = XmlHelper.readBooleanContents(element, "buddyReplicationEnabled");
dataGravitationRemoveOnFind = XmlHelper.readBooleanContents(element, "dataGravitationRemoveOnFind", true);
dataGravitationSearchBackupTrees = XmlHelper.readBooleanContents(element, "dataGravitationSearchBackupTrees", true);
- autoDataGravitation = enabled && XmlHelper.readBooleanContents(element, "autoDataGravitation", true);
+ autoDataGravitation = enabled && XmlHelper.readBooleanContents(element, "autoDataGravitation", false);
String strBuddyCommunicationTimeout = XmlHelper.readStringContents(element, "buddyCommunicationTimeout");
try
|
|
From: Manik S. <msu...@jb...> - 2006-07-10 16:21:13
|
User: msurtani
Date: 06/07/10 12:21:09
Modified: src/org/jboss/cache/interceptors Tag:
Branch_JBossCache_1_4_0
DataGravitatorInterceptor.java
Log:
Revision Changes Path
No revision
No revision
1.16.2.2 +8 -10 JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DataGravitatorInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- DataGravitatorInterceptor.java 10 Jul 2006 12:17:34 -0000 1.16.2.1
+++ DataGravitatorInterceptor.java 10 Jul 2006 16:21:09 -0000 1.16.2.2
@@ -35,16 +35,14 @@
import java.util.Vector;
/**
- * The Data Gravitator is a type of cache loader that queries the cluster for data. Behaviourally very similar to
- * {@see ClusteredCacheLoader} which it extends, it adds on further semantics specific to data gravitation.
- * <p />
- * Optional config properties such as:
- * <ul>
- * <li>removeOnFind - defaults to true, forces all remote caches that own the data or hold backups for the data to remove that data,
- * thereby making the requesting cache the new data owner. If set to false an evict is broadcast instead of a remove, so any state
- * persisted in cache loaders will remain. This is useful if you have a shared cache loader configured.</li>
- * <li>searchBackupTrees - defaults to true, causes remote caches to search through their backup subtrees in addition to their main data trees.</li>
- * </ul>
+ * The Data Gravitator interceptor intercepts cache misses and attempts t gravitate data from other parts of the cluster.
+ *
+ * Only used if Buddy Replication is enabled. Also, the interceptor only kicks in if an {@link Option} is passed in to
+ * force Data Gravitation for a specific invocation or if <b>autoDataGravitation</b> is set to <b>true</b> when configuring
+ * Buddy Replication.
+ *
+ * See the JBoss Cache User Guide for more details on configuration options. There is a section dedicated to Buddy Replication
+ * in the Replication chapter.
*
* @author <a href="mailto:ma...@jb...">Manik Surtani (ma...@jb...)</a>
*/
|
|
From: Heiko W. R. <hw...@pi...> - 2006-07-10 16:06:40
|
User: pilhuhn Date: 06/07/10 12:06:35 Modified: jbosstest build.xml Log: Add JoeSNMP to test classpath. Revision Changes Path 1.581 +2 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.580 retrieving revision 1.581 diff -u -b -r1.580 -r1.581 --- build.xml 30 Jun 2006 20:02:58 -0000 1.580 +++ build.xml 10 Jul 2006 16:06:35 -0000 1.581 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.580 2006/06/30 20:02:58 afu Exp $ --> +<!-- $Id: build.xml,v 1.581 2006/07/10 16:06:35 pilhuhn Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -93,6 +93,7 @@ <path refid="ibm.wsdl4j.classpath"/> <path refid="jacorb.jacorb.classpath"/> <path refid="jgroups.jgroups.classpath"/> + <path refid="joesnmp.joesnmp.classpath"/> <path refid="junit.junit.classpath"/> <path refid="junitejb.junitejb.classpath"/> <path refid="javassist.classpath"/> |
185 messages has been excluded from this view by a project administrator.
