Too bad that cvs annotate doesn't operate on branches... however, for
this particular file, cvs log shows the following revisions exist:
1.1.2.1
1.1.2.2 (same file, different branch: 1.1.4.2)
1.1.4.3
1.1.4.4
All of these changes were made by Prasad Subramanian (prasads). So you
can see the progession of these changes w/ the following cvs commands:
cvs diff -u -r 1.1.2.1 -r 1.1.2.2 WebArchiveDeployer.java
cvs diff -u -r 1.1.2.2 -r 1.1.4.3 WebArchiveDeployer.java
cvs diff -u -r 1.1.4.3 -r 1.1.4.4 WebArchiveDeployer.java
I know this isn't as nice as what cvs annotate would give you, but
probably the information you were looking for. Here are the results of
those commands:
Index: WebArchiveDeployer.java
===================================================================
RCS file:
/cvs/glassfish/appserv-core/src/java/com/sun/enterprise/deployment/backend/Attic/WebArchiveDeployer.java,v
*retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WebArchiveDeployer.java 19 Aug 2007 07:02:15 -0000 1.1.2.1
+++ WebArchiveDeployer.java 20 Aug 2007 05:51:12 -0000 1.1.2.2
*@@ -93,7 +93,7 @@
private DeployableObjectType _origType = null;
private static StringManager localStrings =
StringManager.getManager( WebArchiveDeployer.class );
- private boolean isConverged = true;
+ private boolean isConverged = false;
protected static Logger logger = DeploymentLogger.get();
@@ -142,8 +142,13 @@
public void setConverged(boolean isConverged) {
this.isConverged = isConverged;
- if(isConverged && request != null)
- request.addOptionalArgument("isConverged", "true");
+ if(request !=null) {
+ if(isConverged) {
+ request.addOptionalArgument("isConverged", "true");
+ } else {
+ request.addOptionalArgument("isConverged", "false");
+ }
+ }
}
public void processWebArchive() {
Index: WebArchiveDeployer.java
===================================================================
RCS file:
/cvs/glassfish/appserv-core/src/java/com/sun/enterprise/deployment/backend/Attic/WebArchiveDeployer.java,v
*retrieving revision 1.1.2.2
retrieving revision 1.1.4.3*
*diff -u -r1.1.2.2 -r1.1.4.3
--- WebArchiveDeployer.java 20 Aug 2007 05:51:12 -0000 1.1.2.2
+++ WebArchiveDeployer.java 10 Oct 2007 05:47:14 -0000 1.1.4.3
*@@ -270,7 +270,7 @@
File moduleScratchDirectory,
ModuleType moduleType) {
try {
- Application application = null;
+ Application app = null;
BaseManager emMgr =
(BaseManager)PluggableDeploymentInfo.
getExtensionModuleDeployer(moduleType).getConfigManager();
@@ -278,23 +278,24 @@
moduleRootDirectory.getAbsolutePath());
WebArchivist webArchivist = new WebArchivist();
- application = ApplicationArchivist.openArchive(moduleName,
+ app = ApplicationArchivist.openArchive(moduleName,
webArchivist, archive,
true);
//if(!isSystemAdmin(moduleName) && !isSystem(moduleName)) {
// we need to read persistence descriptors separately
// because they are read from appDir as oppsed to
xmlDir.
emMgr.readPersistenceDeploymentDescriptors(
moduleRootDirectory.getAbsolutePath(),
-
application);
+ app);
//}
- application.setGeneratedXMLDirectory(
+ app.setGeneratedXMLDirectory(
moduleScratchDirectory.getAbsolutePath());
- if (!application.getWebServiceDescriptors().isEmpty()) {
+ if (!app.getWebServiceDescriptors().isEmpty()) {
ModuleContentLinker visitor = new ModuleContentLinker(archive);
- application.visit(
+ app.visit(
(com.sun.enterprise.deployment.util.ApplicationVisitor) visitor);
}
+ return app;
} catch (IOException ioe) {
logger.log(Level.SEVERE,ioe.toString());
return null;
@@ -304,8 +305,10 @@
} catch (SAXParseException spe) {
logger.log(Level.SEVERE, spe.toString());
return null;
- }
- return application;
+ } catch (Exception ex) {
+ logger.log(Level.SEVERE, ex.toString());
+ return null;
+ }
}
/**
Index: WebArchiveDeployer.java
===================================================================
RCS file:
/cvs/glassfish/appserv-core/src/java/com/sun/enterprise/deployment/backend/Attic/WebArchiveDeployer.java,v
*retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -r1.1.4.3 -r1.1.4.4
--- WebArchiveDeployer.java 10 Oct 2007 05:47:14 -0000 1.1.4.3
+++ WebArchiveDeployer.java 13 Oct 2007 16:40:28 -0000 1.1.4.4
*@@ -94,6 +94,8 @@
private static StringManager localStrings =
StringManager.getManager( WebArchiveDeployer.class );
private boolean isConverged = false;
+ private boolean isRuntimeXMLValidation = false;
+ private String runtimeXMLValidationLevel = "none";
protected static Logger logger = DeploymentLogger.get();
@@ -112,6 +114,10 @@
String msg =
localStrings.getString("enterprise.deployment.backend.nullInstanceEnv");
logger.log(Level.SEVERE, msg);
}
+ if(request.isVerifying()) {
+ isRuntimeXMLValidation = true;
+ runtimeXMLValidationLevel = "full";
+ }
try {
request.verify();
} catch(IASDeploymentException iasde) {
@@ -151,6 +157,14 @@
}
}
+ public boolean getRuntimeXMLValidation() {
+ return isRuntimeXMLValidation;
+ }
+
+ public String getRuntimeXMLValidationLevel() {
+ return runtimeXMLValidationLevel;
+ }
+
public void processWebArchive() {
try{
doRequestFinish();
Good luck!
Ken
Dinesh Patil wrote:
> Bill Shannon wrote:
>> Any cvs experts out there? We're having a problem with cvs annotate.
>> In some cases, cvs annotate returns nothing. I'm sure it has something
>> to do with branches, but I don't understand cvs well enough to know what
>> to do to fix it. For example:
>>
>> cd glassfish/appserv-core/src/java
>> cvs annotate
>> com/sun/enterprise/deployment/backend/WebArchiveDeployer.java
>>
>> <<returns nothing>>
>>
>> Any idea how to get cvs to return useful data in this case?
> It seems this file is added in SAILFIN_BRANCH initially, so present
> only in SJSAS91_FCS_BRANCH, not in UR1. cvs annotate seems to be
> printing revisions of the trunk only, so that's why no info is
> provided, other files it shows the info.
>
> *For each file in files, print the head revision of the trunk,
> together with information on the last modification for each line.*
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>
>