[jboss-as7-dev] I'm having the weirdest problem with server.log showing up in bin

[Scott Stark]

I don't get it. This claims there is no diff:

[341](ironmaiden:jboss-as) > git diff upstream/master 
logging/src/main/java/org/jboss/as/logging/PeriodicRotatingFileHandlerAdd.java[342](ironmaiden:jboss-as) 
 >

and yet if I clone git://github.com/jbossas/jboss-as.git into 
upstream-jboss-as and diff against that there are several differences:

[340](ironmaiden:jboss-as) > diff 
logging/src/main/java/org/jboss/as/logging/PeriodicRotatingFileHandlerAdd.java 
/home/git/JBossAS/upstream-jboss-as/logging/src/main/java/org/jboss/as/logging/PeriodicRotatingFileHandlerAdd.java
36a37
 > import static org.jboss.as.logging.CommonAttributes.HANDLER_TYPE;
38a40
 > import static org.jboss.as.logging.CommonAttributes.QUEUE_LENGTH;
62a65,66
 >     static final String OPERATION_NAME = "add-periodic-handler";
 >
73a78,83
 >         final String handlerType = 
operation.require(HANDLER_TYPE).asString();
 >         final LoggerHandlerType type = 
LoggerHandlerType.valueOf(handlerType);
 >         if(type != LoggerHandlerType.PERIODIC_ROTATING_FILE_HANDLER) {
 >             throw new OperationFailedException(new 
ModelNode().set("invalid operation for handler-type: " + type));
 >         }
 >
77a88
 >         subModel.get(HANDLER_TYPE).set(handlerType);
79a91
 >         subModel.get(QUEUE_LENGTH).set(operation.get(QUEUE_LENGTH));
90,93c102,103
<                             final HandlerFileService fileService = new 
HandlerFileService(operation.get(FILE, PATH).asString());
<                             final ServiceBuilder<?> fileBuilder = 
serviceTarget.addService(LogServices.handlerFileName(name), fileService);
<                             if 
(operation.hasDefined(CommonAttributes.RELATIVE_TO)) {
<                                 
fileBuilder.addDependency(AbstractPathService.pathNameOf(operation.get(FILE, 
RELATIVE_TO).asString()), String.class, 
fileService.getRelativeToInjector());
---
 >                             if 
(operation.get(FILE).hasDefined(RELATIVE_TO)) {
 >                                 
serviceBuilder.addDependency(AbstractPathService.pathNameOf(operation.get(FILE, 
RELATIVE_TO).asString()), String.class, service.getRelativeToInjector());
95,96c105
<                             
fileBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
<                             
serviceBuilder.addDependency(LogServices.handlerFileName(name), 
String.class, service.getFileNameInjector());
---
 >                             service.setPath(operation.get(FILE, 
PATH).asString());

[343](ironmaiden:jboss-as) > diff 
logging/src/main/java/org/jboss/as/logging/PeriodicRotatingFileHandlerAdd.java 
/home/git/JBossAS/upstream-jboss-as/logging/src/main/java/org/jboss/as/logging/PeriodicRotatingFileHandlerAdd.java 
| cksum
494053061 1917


On 5/20/11 8:39 AM, Jason T. Greene wrote:
> It looks like you are diffing your local tree against your github 
> origin, instead of upstream. BTW your origin has a merge commit at the 
> top right now. You probably want to git push -f it.
>
>
>