ccmtools-cvs — Notification of CVS commits for the CCM Tools

[ccmtools-cvs] ccmtools/src/ccmtools/generator/java Main.java, 1.12, 1.13

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5682/src/ccmtools/generator/java

Modified Files:
	Main.java 
Log Message:
*) UserException now calculates the repo-id
*) all CCM-exceptions copy the message text to java.lang.Exception
*) some small updates

Index: Main.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/Main.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Main.java	21 Feb 2007 08:49:32 -0000	1.12
--- Main.java	12 Apr 2007 15:24:13 -0000	1.13
***************
*** 2,6 ****
  
  import java.io.FileNotFoundException;
- import java.util.Iterator;
  import java.util.List;
  import java.util.logging.Logger;
--- 2,5 ----

[ccmtools-cvs] ccmtools/test/JavaLocalComponents/exceptions1 exceptions1.idl, NONE, 1.1 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaLocalComponents/exceptions1
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5682/test/JavaLocalComponents/exceptions1

Added Files:
	exceptions1.idl .cvsignore Makefile 
Log Message:
*) UserException now calculates the repo-id
*) all CCM-exceptions copy the message text to java.lang.Exception
*) some small updates

--- NEW FILE: .cvsignore ---
xxx

--- NEW FILE: Makefile ---
all:
	ccmjava -app -iface -local -o xxx exceptions1.idl

clean:
	rm -rf xxx

--- NEW FILE: exceptions1.idl ---
module MyModule {

exception MyException
{
	string reason;
};

interface MyInterface
{
	double sqrt(in double x) raises(MyException);
};

component MyComponent
{
	provides MyInterface myFacet;
};

home MyComponentHome manages MyComponent {};

};	// /module MyModule

[ccmtools-cvs] ccmtools/test/JavaLocalComponents/exceptions1 - New directory

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaLocalComponents/exceptions1
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5508/test/JavaLocalComponents/exceptions1

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/JavaLocalComponents/exceptions1 added to the repository

[ccmtools-cvs] java-environment/src/Components IllegalState.java, 1.1, 1.2 InvalidConnection.java, 1.1, 1.2 InvalidAssembly.java, 1.1, 1.2 AlreadyConnected.java, 1.1, 1.2 WrongComponentType.java, 1.1, 1.2 UserException.java, 1.1, 1.2 InvalidConfiguration.java, 1.1, 1.2 InvalidName.java, 1.1, 1.2 CCMException.java, 1.1, 1.2 InvalidLocation.java, 1.1, 1.2 CreateFailure.java, 1.1, 1.2 RemoveFailure.java, 1.1, 1.2 CookieRequired.java, 1.1, 1.2 ExceededConnectionLimit.java, 1.1, 1.2 HomeNotFound.java, 1.1, 1.2 NoConnection.java, 1.1, 1.2

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/java-environment/src/Components
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4568/src/Components

Modified Files:
	IllegalState.java InvalidConnection.java InvalidAssembly.java 
	AlreadyConnected.java WrongComponentType.java 
	UserException.java InvalidConfiguration.java InvalidName.java 
	CCMException.java InvalidLocation.java CreateFailure.java 
	RemoveFailure.java CookieRequired.java 
	ExceededConnectionLimit.java HomeNotFound.java 
	NoConnection.java 
Log Message:
*) UserException now calculates the repo-id
*) all CCM-exceptions copy the message text to java.lang.Exception

Index: NoConnection.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/NoConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NoConnection.java	10 Jan 2007 16:11:28 -0000	1.1
--- NoConnection.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class NoConnection
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = 8687891271765409198L;
! 	private static final String REPOSITORY_ID = "IDL:Components/NoConnection:1.0";
! 	
! 	public NoConnection() 
      {
! 		super(REPOSITORY_ID);
      }
! 	
!     public NoConnection(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class NoConnection extends Components.UserException
  {
!     private static final long serialVersionUID = 8687891271765409198L;
! 
!     private static final String DEFAULT_MESSAGE = "no connection";
! 
!     public NoConnection()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public NoConnection( String reason )
      {
!         super(reason);
      }
  }

Index: WrongComponentType.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/WrongComponentType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WrongComponentType.java	10 Jan 2007 16:11:28 -0000	1.1
--- WrongComponentType.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class WrongComponentType
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = 2208948298152201554L;
! 	private static final String REPOSITORY_ID = "IDL:Components/WrongComponentType:1.0";
! 	
! 	public WrongComponentType() 
      {
! 		super(REPOSITORY_ID); 
      }
! 	
!     public WrongComponentType(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class WrongComponentType extends Components.UserException
  {
!     private static final long serialVersionUID = 2208948298152201554L;
! 
!     private static final String DEFAULT_MESSAGE = "wrong component type";
! 
!     public WrongComponentType()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public WrongComponentType( String reason )
      {
!         super(reason);
      }
  }

Index: ExceededConnectionLimit.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/ExceededConnectionLimit.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExceededConnectionLimit.java	10 Jan 2007 16:11:29 -0000	1.1
--- ExceededConnectionLimit.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class ExceededConnectionLimit
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = -5714895177604126672L;
! 	private static final String REPOSITORY_ID = "IDL:Components/ExceededConnectionLimit:1.0";
! 	
! 	public ExceededConnectionLimit() 
      {
! 		super(REPOSITORY_ID);
      }
! 	
!     public ExceededConnectionLimit(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class ExceededConnectionLimit extends Components.UserException
  {
!     private static final long serialVersionUID = -5714895177604126672L;
! 
!     private static final String DEFAULT_MESSAGE = "exceeded connection limit";
! 
!     public ExceededConnectionLimit()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public ExceededConnectionLimit( String _reason )
      {
!         super(_reason);
      }
  }

Index: InvalidAssembly.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/InvalidAssembly.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InvalidAssembly.java	10 Jan 2007 16:11:29 -0000	1.1
--- InvalidAssembly.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class InvalidAssembly
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = 4478890731019313469L;
! 	private static final String REPOSITORY_ID = "IDL:Components/InvalidAssembly:1.0";
! 	
! 	public InvalidAssembly() 
      {
! 		super(REPOSITORY_ID);
      }
! 	
!     public InvalidAssembly(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class InvalidAssembly extends Components.UserException
  {
!     private static final long serialVersionUID = 4478890731019313469L;
! 
!     private static final String DEFAULT_MESSAGE = "invalid assembly";
! 
!     public InvalidAssembly()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public InvalidAssembly( String _reason )
      {
!         super(_reason);
      }
  }

Index: AlreadyConnected.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/AlreadyConnected.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AlreadyConnected.java	10 Jan 2007 16:11:29 -0000	1.1
--- AlreadyConnected.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 5,18 ****
  {
  	private static final long serialVersionUID = 6886751009749534622L;
- 	private static final String REPOSITORY_ID = "IDL:Components/AlreadyConnected:1.0";
  	
  	public AlreadyConnected() 
      {
! 		super(REPOSITORY_ID);
      }
  	
!     public AlreadyConnected(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 5,17 ----
  {
  	private static final long serialVersionUID = 6886751009749534622L;
  	
  	public AlreadyConnected() 
      {
! 		super();
      }
  	
!     public AlreadyConnected(String _reason) 
      {
!     	    super(_reason);
      }
  }

Index: CookieRequired.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/CookieRequired.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CookieRequired.java	10 Jan 2007 16:11:29 -0000	1.1
--- CookieRequired.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class CookieRequired
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = -1104666651001979980L;
! 	private static final String REPOSITORY_ID = "IDL:Components/CookieRequired:1.0";
! 	
! 	public CookieRequired() 
      {
! 		super(REPOSITORY_ID);
      }
! 	
! 	public CookieRequired(String reason) 
      {
! 		super(REPOSITORY_ID + " " + reason);
!     }	
  }
--- 1,18 ----
  package Components;
  
! public class CookieRequired extends Components.UserException
  {
!     private static final long serialVersionUID = -1104666651001979980L;
! 
!     private static final String DEFAULT_MESSAGE = "cookie required";
! 
!     public CookieRequired()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public CookieRequired( String _reason )
      {
!         super(_reason);
!     }
  }

Index: CreateFailure.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/CreateFailure.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreateFailure.java	10 Jan 2007 16:11:28 -0000	1.1
--- CreateFailure.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class CreateFailure
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = -4139103203013279104L;
! 	private static final String REPOSITORY_ID = "IDL:Components/CreateFailure:1.0";
! 	
! 	public CreateFailure() 
      {
! 		super(REPOSITORY_ID);
      }
- 	
- 	public CreateFailure(String reason) 
- 	{
- 		super(REPOSITORY_ID + " " + reason);
- 	}	
  }
--- 1,18 ----
  package Components;
  
! public class CreateFailure extends Components.UserException
  {
!     private static final long serialVersionUID = -4139103203013279104L;
! 
!     private static final String DEFAULT_MESSAGE = "create failure";
! 
!     public CreateFailure()
      {
!         super(DEFAULT_MESSAGE);
!     }
! 
!     public CreateFailure( String _reason )
!     {
!         super(_reason);
      }
  }

Index: InvalidName.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/InvalidName.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InvalidName.java	10 Jan 2007 16:11:29 -0000	1.1
--- InvalidName.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class InvalidName
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = 6897296555631420409L;
! 	private static final String REPOSITORY_ID = "IDL:Components/InvalidName:1.0";
! 	
! 	public InvalidName() 
      {
! 		super(REPOSITORY_ID);
      }
! 	
!     public InvalidName(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class InvalidName extends Components.UserException
  {
!     private static final long serialVersionUID = 6897296555631420409L;
! 
!     private static final String DEFAULT_MESSAGE = "invalid name";
! 
!     public InvalidName()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public InvalidName( String reason )
      {
!         super(reason);
      }
  }

Index: CCMException.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/CCMException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CCMException.java	10 Jan 2007 16:11:29 -0000	1.1
--- CCMException.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,28 ****
  package Components;
  
! public class CCMException
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = -9007924014999270105L;
!     private static final String REPOSITORY_ID = "IDL:Components/CCMException:1.0";
!     
      private CCMExceptionReason reason;
  
!     public CCMException() 
      {
!         super(REPOSITORY_ID);
          setReason(null);
      }
  
!     public CCMException(CCMExceptionReason r) 
      {
!         super(REPOSITORY_ID);
          setReason(r);
      }
!         
!     public CCMException(String reason, CCMExceptionReason r)    
      {
!         super(REPOSITORY_ID + " " + reason);
!         setReason(r);       
      }
  
--- 1,40 ----
  package Components;
  
! public class CCMException extends Components.UserException
  {
!     private static final long serialVersionUID = -9007924014999270105L;
! 
!     private static final String DEFAULT_MESSAGE = "CCM exception";
! 
      private CCMExceptionReason reason;
  
!     public CCMException()
      {
!         super(DEFAULT_MESSAGE);
          setReason(null);
      }
  
!     public CCMException( CCMExceptionReason r )
      {
!         super(DEFAULT_MESSAGE);
          setReason(r);
      }
! 
!     public CCMException( String message, CCMExceptionReason r )
      {
!         super(message);
!         setReason(r);
!     }
! 
!     public CCMException( String message, CCMExceptionReason r, Throwable cause )
!     {
!         super(message, cause);
!         setReason(r);
!     }
! 
!     public CCMException( CCMExceptionReason r, Throwable cause )
!     {
!         super(DEFAULT_MESSAGE, cause);
!         setReason(r);
      }
  
***************
*** 30,36 ****
      {
          return this.reason;
!     }     
  
!     public void setReason(CCMExceptionReason value)
      {
          this.reason = value;
--- 42,48 ----
      {
          return this.reason;
!     }
  
!     public void setReason( CCMExceptionReason value )
      {
          this.reason = value;

Index: IllegalState.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/IllegalState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IllegalState.java	10 Jan 2007 16:11:28 -0000	1.1
--- IllegalState.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class IllegalState
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = -6931824844072445652L;
! 	private static final String REPOSITORY_ID = "IDL:Components/IllegalState:1.0";
! 	
! 	public IllegalState() 
      {
! 		super(REPOSITORY_ID);
      }
! 	
!     public IllegalState(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class IllegalState extends Components.UserException
  {
!     private static final long serialVersionUID = -6931824844072445652L;
! 
!     private static final String DEFAULT_MESSAGE = "illegal state";
! 
!     public IllegalState()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public IllegalState( String _reason )
      {
!         super(_reason);
      }
  }

Index: InvalidConnection.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/InvalidConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InvalidConnection.java	10 Jan 2007 16:11:28 -0000	1.1
--- InvalidConnection.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class InvalidConnection
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = -3095009263968067357L;
! 	private static final String REPOSITORY_ID = "IDL:Components/InvalidConnection:1.0";
! 		
! 	public InvalidConnection() 
      {
! 		super(REPOSITORY_ID);
      }
- 	
- 	public InvalidConnection(String reason) 
- 	{
- 		super(REPOSITORY_ID + " " + reason);
- 	}
  }
--- 1,18 ----
  package Components;
  
! public class InvalidConnection extends Components.UserException
  {
!     private static final long serialVersionUID = -3095009263968067357L;
! 
!     private static final String DEFAULT_MESSAGE = "invalid connection";
! 
!     public InvalidConnection()
      {
!         super(DEFAULT_MESSAGE);
!     }
! 
!     public InvalidConnection( String _reason )
!     {
!         super(_reason);
      }
  }

Index: InvalidConfiguration.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/InvalidConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InvalidConfiguration.java	10 Jan 2007 16:11:28 -0000	1.1
--- InvalidConfiguration.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class InvalidConfiguration
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = -294782326819622429L;
! 	private static final String REPOSITORY_ID = "IDL:Components/InvalidConfiguration:1.0";
! 	
! 	public InvalidConfiguration() 
      {
! 		super(REPOSITORY_ID);
      }
! 	
!     public InvalidConfiguration(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class InvalidConfiguration extends Components.UserException
  {
!     private static final long serialVersionUID = -294782326819622429L;
! 
!     private static final String DEFAULT_MESSAGE = "invalid configuration";
! 
!     public InvalidConfiguration()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public InvalidConfiguration( String reason )
      {
!         super(reason);
      }
  }

Index: InvalidLocation.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/InvalidLocation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InvalidLocation.java	10 Jan 2007 16:11:29 -0000	1.1
--- InvalidLocation.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class InvalidLocation
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = 292325942395365465L;
! 	private static final String REPOSITORY_ID = "IDL:Components/InvalidLocation:1.0";
! 	
! 	public InvalidLocation() 
      {
! 		super(REPOSITORY_ID);
      }
- 	
- 	public InvalidLocation(String reason) 
- 	{
- 		super(REPOSITORY_ID + " " + reason);
- 	}
  }
--- 1,18 ----
  package Components;
  
! public class InvalidLocation extends Components.UserException
  {
!     private static final long serialVersionUID = 292325942395365465L;
! 
!     private static final String DEFAULT_MESSAGE = "invalid location";
! 
!     public InvalidLocation()
      {
!         super(DEFAULT_MESSAGE);
!     }
! 
!     public InvalidLocation( String _reason )
!     {
!         super(_reason);
      }
  }

Index: UserException.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/UserException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UserException.java	10 Jan 2007 16:11:28 -0000	1.1
--- UserException.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class UserException
! 	extends java.lang.Exception
  {
! 	private static final long serialVersionUID = -1127609876865983434L;
! 	private static final String REPOSITORY_ID = "IDL:Components/UserException:1.0";
! 	
! 	public UserException() 
      {
! 		super(REPOSITORY_ID);
      }
!     
!     public UserException(String reason) 
      {
! 	    super(reason);
      }
  }
--- 1,34 ----
  package Components;
  
! public class UserException extends java.lang.Exception
  {
!     private static final long serialVersionUID = -1127609876865983434L;
! 
!     private static final String DEFAULT_MESSAGE = "ccmtools user exception";
! 
!     public UserException()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public UserException( String message )
      {
!         super(message);
!     }
! 
!     public UserException( String message, Throwable cause )
!     {
!         super(message, cause);
!     }
! 
!     public UserException( Throwable cause )
!     {
!         super(DEFAULT_MESSAGE, cause);
!     }
! 
!     public String getRepoId()
!     {
!         String cls = this.getClass().getName();
!         return "IDL:ccmtools/" + cls + ":1.0";
      }
  }

Index: HomeNotFound.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/HomeNotFound.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HomeNotFound.java	10 Jan 2007 16:11:29 -0000	1.1
--- HomeNotFound.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class HomeNotFound
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = -8114743147626972429L;
! 	private static final String REPOSITORY_ID = "IDL:Components/HomeNotFound:1.0";
! 	
! 	public HomeNotFound() 
      {
! 		super(REPOSITORY_ID);
      }
! 	
!     public HomeNotFound(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class HomeNotFound extends Components.UserException
  {
!     private static final long serialVersionUID = -8114743147626972429L;
! 
!     private static final String DEFAULT_MESSAGE = "home not found";
! 
!     public HomeNotFound()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public HomeNotFound( String _reason )
      {
!         super(_reason);
      }
  }

Index: RemoveFailure.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/Components/RemoveFailure.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RemoveFailure.java	10 Jan 2007 16:11:28 -0000	1.1
--- RemoveFailure.java	12 Apr 2007 15:21:42 -0000	1.2
***************
*** 1,18 ****
  package Components;
  
! public class RemoveFailure
! 	extends Components.UserException
  {
! 	private static final long serialVersionUID = 1044618169291791571L;
! 	private static final String REPOSITORY_ID = "IDL:Components/RemoveFailure:1.0";
! 	
! 	public RemoveFailure() 
      {
! 		super(REPOSITORY_ID); 
      }
! 	
!     public RemoveFailure(String reason) 
      {
!     	    super(REPOSITORY_ID + " " + reason);
      }
  }
--- 1,18 ----
  package Components;
  
! public class RemoveFailure extends Components.UserException
  {
!     private static final long serialVersionUID = 1044618169291791571L;
! 
!     private static final String DEFAULT_MESSAGE = "remove failure";
! 
!     public RemoveFailure()
      {
!         super(DEFAULT_MESSAGE);
      }
! 
!     public RemoveFailure( String reason )
      {
!         super(reason);
      }
  }

[ccmtools-cvs] java-environment/src/ccmtools/local CorbaConverterException.java, 1.1, 1.2

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/java-environment/src/ccmtools/local
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4568/src/ccmtools/local

Modified Files:
	CorbaConverterException.java 
Log Message:
*) UserException now calculates the repo-id
*) all CCM-exceptions copy the message text to java.lang.Exception

Index: CorbaConverterException.java
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/src/ccmtools/local/CorbaConverterException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CorbaConverterException.java	10 Jan 2007 16:11:31 -0000	1.1
--- CorbaConverterException.java	12 Apr 2007 15:21:43 -0000	1.2
***************
*** 7,20 ****
  {
  	private static final long serialVersionUID = -2010901086161763339L;
- 	private static final String REPOSITORY_ID = "IDL:Components/CorbaConverterException:1.0";
  	
  	public CorbaConverterException() 
      {
!         super(REPOSITORY_ID, CCMExceptionReason.SYSTEM_ERROR);
      }
  	
! 	public CorbaConverterException(String reason)
  	{
! 		super(REPOSITORY_ID + "  " + reason, CCMExceptionReason.SYSTEM_ERROR);
  	}
  }
--- 7,19 ----
  {
  	private static final long serialVersionUID = -2010901086161763339L;
  	
  	public CorbaConverterException() 
      {
!         super(CCMExceptionReason.SYSTEM_ERROR);
      }
  	
! 	public CorbaConverterException(String _reason)
  	{
! 		super(_reason, CCMExceptionReason.SYSTEM_ERROR);
  	}
  }

[ccmtools-cvs] ccmtools/src-test/ccmtools/test CcmtoolsTestCase.java, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/test
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32248/src-test/ccmtools/test

Modified Files:
	CcmtoolsTestCase.java 
Log Message:
Refactored JUnit test to support execution on Windows platforms.

Index: CcmtoolsTestCase.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/test/CcmtoolsTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CcmtoolsTestCase.java	30 Nov 2006 18:49:37 -0000	1.1
--- CcmtoolsTestCase.java	12 Apr 2007 15:09:27 -0000	1.2
***************
*** 47,50 ****
--- 47,73 ----
      }
  
+     
+     /**
+      * Run the ant build tool with the given command line.
+      * Note that Windows needs the '.bat' suffix to be happy.
+      * 
+      * @param cmdline A String containing all options and parameters used for the ant call.
+      * @throws CcmtoolsTestCaseException 
+      */
+     protected void runAnt(String cmdline) 
+         throws CcmtoolsTestCaseException
+     {
+         String os = System.getProperty("os.name");
+         if(os.startsWith("Windows"))
+         {
+             executeCommandLine("ant.bat " + cmdline);
+         }
+         else
+         {
+             executeCommandLine("ant " + cmdline);
+         }
+     }    
+     
+     
      /**
       * Run the ccmtools generator by calling ccmtools.UI.ConsoleCodeGenerator's
***************
*** 174,178 ****
          }
          catch(Exception e) {
!             throw new CcmtoolsTestCaseException("exec error");
          }
          
--- 197,201 ----
          }
          catch(Exception e) {
!             throw new CcmtoolsTestCaseException("exec error:" + e.getMessage());
          }
          

[ccmtools-cvs] ccmtools/src-test/ccmtools/generator/java/remote FacetTest.java, 1.2, 1.3

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/generator/java/remote
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32248/src-test/ccmtools/generator/java/remote

Modified Files:
	FacetTest.java 
Log Message:
Refactored JUnit test to support execution on Windows platforms.

Index: FacetTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/generator/java/remote/FacetTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FacetTest.java	12 Apr 2007 12:47:33 -0000	1.2
--- FacetTest.java	12 Apr 2007 15:09:27 -0000	1.3
***************
*** 19,23 ****
          // get current working directory (this is where build.xml is executed)
          ccmtoolsDir = System.getProperty("user.dir");
!         testDir = ccmtoolsDir + "/test/JavaRemoteComponents";
      }
  
--- 19,23 ----
          // get current working directory (this is where build.xml is executed)
          ccmtoolsDir = System.getProperty("user.dir");
!         testDir = ccmtoolsDir + SEP + "test" + SEP + "JavaRemoteComponents";
      }
  
***************
*** 81,90 ****
      {
          try 
!         {        	
!             executeCommandLine("ant -f " + testDir + SEP + "facet_simple" + SEP + "Makefile.xml");            
          }
          catch(Exception e) 
          {
!             fail();
          }
      }
--- 81,90 ----
      {
          try 
!         {     
!             runAnt("-f "  + testDir + SEP + "facet_simple" + SEP + "Makefile.xml");
          }
          catch(Exception e) 
          {
!             fail(e.getMessage());
          }
      }

[ccmtools-cvs] ccmtools/src/ccmtools/ant IncludePath.java, 1.1, 1.2 GeneratorType.java, 1.1, 1.2 IdljTask.java, 1.1, 1.2 BindingType.java, 1.1, 1.2 CcmtoolsTask.java, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31839/src/ccmtools/ant

Modified Files:
	IncludePath.java GeneratorType.java IdljTask.java 
	BindingType.java CcmtoolsTask.java 
Log Message:
Added GNU License text

Index: IdljTask.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/IdljTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IdljTask.java	12 Apr 2007 11:54:39 -0000	1.1
--- IdljTask.java	12 Apr 2007 15:08:28 -0000	1.2
***************
*** 1,2 ****
--- 1,21 ----
+ /* CCM Tools : ccmtools ant tasks
+  * Egon Teiniker <ego...@fh...>
+  * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net
+  *
+  * This library 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 library 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 library; if not, write to the Free Software Foundation, Inc.,
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
  package ccmtools.ant;
  

Index: CcmtoolsTask.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/CcmtoolsTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CcmtoolsTask.java	12 Apr 2007 11:54:39 -0000	1.1
--- CcmtoolsTask.java	12 Apr 2007 15:08:28 -0000	1.2
***************
*** 1,2 ****
--- 1,21 ----
+ /* CCM Tools : ccmtools ant tasks
+  * Egon Teiniker <ego...@fh...>
+  * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net
+  *
+  * This library 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 library 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 library; if not, write to the Free Software Foundation, Inc.,
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
  package ccmtools.ant;
  

Index: BindingType.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/BindingType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BindingType.java	12 Apr 2007 11:54:39 -0000	1.1
--- BindingType.java	12 Apr 2007 15:08:28 -0000	1.2
***************
*** 1,2 ****
--- 1,21 ----
+ /* CCM Tools : ccmtools ant tasks
+  * Egon Teiniker <ego...@fh...>
+  * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net
+  *
+  * This library 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 library 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 library; if not, write to the Free Software Foundation, Inc.,
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
  package ccmtools.ant;
  

Index: IncludePath.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/IncludePath.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IncludePath.java	12 Apr 2007 11:54:39 -0000	1.1
--- IncludePath.java	12 Apr 2007 15:08:28 -0000	1.2
***************
*** 1,2 ****
--- 1,21 ----
+ /* CCM Tools : ccmtools ant tasks
+  * Egon Teiniker <ego...@fh...>
+  * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net
+  *
+  * This library 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 library 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 library; if not, write to the Free Software Foundation, Inc.,
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
  package ccmtools.ant;
  

Index: GeneratorType.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/ant/GeneratorType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeneratorType.java	12 Apr 2007 11:54:39 -0000	1.1
--- GeneratorType.java	12 Apr 2007 15:08:28 -0000	1.2
***************
*** 1,2 ****
--- 1,21 ----
+ /* CCM Tools : ccmtools ant tasks
+  * Egon Teiniker <ego...@fh...>
+  * Copyright (C) 2002 - 2007 ccmtools.sourceforge.net
+  *
+  * This library 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 library 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 library; if not, write to the Free Software Foundation, Inc.,
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
  package ccmtools.ant;
  

[ccmtools-cvs] ccmtools/test/IDLParser/include/xxx/component Test.idl, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/include/xxx/component
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25783/test/IDLParser/include/xxx/component

Removed Files:
	Test.idl 
Log Message:
Removed old file

--- Test.idl DELETED ---

[ccmtools-cvs] ccmtools/src-test/ccmtools/generator/java/remote FacetTest.java, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/generator/java/remote
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9800/src-test/ccmtools/generator/java/remote

Modified Files:
	FacetTest.java 
Log Message:
Refactored JUnit test to support Makefile.xml

Index: FacetTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/generator/java/remote/FacetTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FacetTest.java	8 Nov 2006 10:31:41 -0000	1.1
--- FacetTest.java	12 Apr 2007 12:47:33 -0000	1.2
***************
*** 1,4 ****
--- 1,6 ----
  package ccmtools.generator.java.remote;
  
+ import java.io.File;
+ 
  import junit.framework.Test;
  import junit.framework.TestSuite;
***************
*** 8,11 ****
--- 10,14 ----
  	extends CcmtoolsTestCase
  {
+ 	private final String SEP = File.separator;
      private String ccmtoolsDir;
      private String testDir;
***************
*** 78,83 ****
      {
          try 
!         {
!             executeCommandLine("make -C " + testDir + "/facet_simple test");
          }
          catch(Exception e) 
--- 81,86 ----
      {
          try 
!         {        	
!             executeCommandLine("ant -f " + testDir + SEP + "facet_simple" + SEP + "Makefile.xml");            
          }
          catch(Exception e) 

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_simple Makefile.xml, 1.2, 1.3

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8980/test/JavaRemoteComponents/facet_simple

Modified Files:
	Makefile.xml 
Log Message:
Refactored Makefile.xml 

Index: Makefile.xml
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple/Makefile.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.xml	12 Apr 2007 12:32:19 -0000	1.2
--- Makefile.xml	12 Apr 2007 12:45:39 -0000	1.3
***************
*** 113,125 ****
  		
  		<java classname="Client" classpathref="compile.classpath" failonerror="true" fork="true">
! 			<assertions> <enable/></assertions>
  		</java>
  		
  		<java classname="Client" classpathref="compile.classpath" failonerror="true" fork="true">
! 			<assertions> <enable/></assertions>
! 			<arg value="-ORBInitRef"/>
! 			<arg value="NameService=corbaloc:iiop:1.2@localhost:5050/NameService"/>
! 			<arg value="-ORBServerHost"/>
! 			<arg value="localhost"/>
  		</java>
  	</target>
--- 113,123 ----
  		
  		<java classname="Client" classpathref="compile.classpath" failonerror="true" fork="true">
! 			<assertions><enable/></assertions>
  		</java>
  		
  		<java classname="Client" classpathref="compile.classpath" failonerror="true" fork="true">
! 			<assertions><enable/></assertions>
! 			<arg line="-ORBInitRef NameService=corbaloc:iiop:1.2@localhost:5050/NameService"/>
! 			<arg line="-ORBServerHost localhost"/>
  		</java>
  	</target>

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_simple Makefile.xml, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3765/test/JavaRemoteComponents/facet_simple

Modified Files:
	Makefile.xml 
Log Message:
Refactored Makefile.xml 

Index: Makefile.xml
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple/Makefile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.xml	12 Apr 2007 11:55:17 -0000	1.1
--- Makefile.xml	12 Apr 2007 12:32:19 -0000	1.2
***************
*** 112,118 ****
  	    </javac>
  		
! 		<java classname="Client" classpathref="compile.classpath" failonerror="true"/>
  		
! 		<java classname="Client" classpathref="compile.classpath" failonerror="true">
  			<arg value="-ORBInitRef"/>
  			<arg value="NameService=corbaloc:iiop:1.2@localhost:5050/NameService"/>
--- 112,121 ----
  	    </javac>
  		
! 		<java classname="Client" classpathref="compile.classpath" failonerror="true" fork="true">
! 			<assertions> <enable/></assertions>
! 		</java>
  		
! 		<java classname="Client" classpathref="compile.classpath" failonerror="true" fork="true">
! 			<assertions> <enable/></assertions>
  			<arg value="-ORBInitRef"/>
  			<arg value="NameService=corbaloc:iiop:1.2@localhost:5050/NameService"/>

[ccmtools-cvs] ccmtools build.xml,1.77,1.78

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21469

Modified Files:
	build.xml 
Log Message:
Refactored build.xml to support Windows builds too.

Index: build.xml
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/build.xml,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** build.xml	19 Feb 2007 09:39:21 -0000	1.77
--- build.xml	12 Apr 2007 11:55:54 -0000	1.78
***************
*** 17,23 ****
    	<property name="test" location="test" />
  
  
!   	<!-- Define different paths that are used in the following tasks -->
! 
  	<path id="compile.classpath">
    		<pathelement path="${lib}/commons-cli-1.0.jar" />
--- 17,29 ----
    	<property name="test" location="test" />
  
+ 	<!-- 
+ 		If this build is running in a Unix like system the isUnix property 
+ 		will be set to true.
+ 	-->
+ 	<condition property="isUnix"> <os family="unix"/> </condition>
  
!   	<!-- 
!   		Define different paths that are used in the following tasks 
!   	-->
  	<path id="compile.classpath">
    		<pathelement path="${lib}/commons-cli-1.0.jar" />
***************
*** 32,37 ****
  
  
!   	<!-- Set up directories for the build process -->
! 
  	<target name="init" >
        	<mkdir dir="${src-gen}" />
--- 38,44 ----
  
  
!   	<!-- 
!   		Set up directories for the build process 
!   	-->
  	<target name="init" >
        	<mkdir dir="${src-gen}" />
***************
*** 41,47 ****
    	</target>
  
  
-   	<!-- Generate IDL3 parser source code using ANTLR -->
  
  	<target name="generate.IDL3Parser" depends="init">
        	<antlr target="${src}/ccmtools/parser/idl3/idl3new.g"
--- 48,73 ----
    	</target>
  
+ 	
+ 	<!-- 
+ 		Clean up all generated files and directories
+ 	-->
+   	<target name="clean" description="Clean up the build and lib directory." >
+       	<delete file="${src}/${PACKAGE}/Constants.java" />
+       	<delete file="${src}/ccmtools/parser/idl3/Idl3Lexer.java" />
+       	<delete file="${src}/ccmtools/parser/idl3/Idl3Parser.java" />
+       	<delete file="${src}/ccmtools/parser/idl3/Idl3TokenTypes.java" />
+       	<delete file="${src}/ccmtools/parser/idl3/Idl3TokenTypes.txt" />
+   		<delete dir="${src}/uml_parser" />
+       	<delete dir="${src-gen}" />
+       	<delete dir="${build}" />
+       	<delete dir="${test}/CppRemoteGenerator/sandbox" />
+       	<delete file="${lib}/ccmtools.jar" />
+   		<delete file="${lib}/assembly.jar" />
+   	</target>
  
  
+   	<!-- 
+   		Generate IDL3 parser source code using ANTLR 
+   	-->
  	<target name="generate.IDL3Parser" depends="init">
        	<antlr target="${src}/ccmtools/parser/idl3/idl3new.g"
***************
*** 52,57 ****
  
  
! 	<!-- Generate IDL parser source code using JFlex+Cup -->
! 
  	<target name="generate.IdlScanner" depends="init">
  		<java jar="${lib}/JFlex.jar" fork="true">
--- 78,84 ----
  
  
! 	<!-- 
! 		Generate IDL parser source code using JFlex+Cup 
! 	-->
  	<target name="generate.IdlScanner" depends="init">
  		<java jar="${lib}/JFlex.jar" fork="true">
***************
*** 67,72 ****
  
  
!     <!-- Generate assembly parser source code using JFlex+Cup -->
! 
      <target name="generate.AssemblyLexer" depends="init">
          <java jar="${lib}/JFlex.jar" fork="true">
--- 94,100 ----
  
  
!     <!-- 
!     	Generate assembly parser source code using JFlex+Cup 
!     -->
      <target name="generate.AssemblyLexer" depends="init">
          <java jar="${lib}/JFlex.jar" fork="true">
***************
*** 100,105 ****
  
  
! 	<!-- Compile ccmtools source code -->
! 
  	<target name="compile.ccmtools" depends="generate.IDL3Parser, generate.IdlScanner, generate.IdlParser, generate.AssemblyLexer, generate.AssemblyParser"
       	description="Compile the ccmtools package." >
--- 128,134 ----
  
  
! 	<!-- 
! 		Compile ccmtools source code 
! 	-->
  	<target name="compile.ccmtools" depends="generate.IDL3Parser, generate.IdlScanner, generate.IdlParser, generate.AssemblyLexer, generate.AssemblyParser"
       	description="Compile the ccmtools package." >
***************
*** 111,115 ****
  
  
!   	<!-- Create Java archive file from all package. -->
  	<target name="jar.ccmtools" depends="compile.ccmtools"
       	description="Create Java archive file from ccmtools package." >
--- 140,146 ----
  
  
!   	<!-- 
!   		Create a Java archive file from compiled ccmtools packages 
!   	-->
  	<target name="jar.ccmtools" depends="compile.ccmtools"
       	description="Create Java archive file from ccmtools package." >
***************
*** 122,137 ****
  
  
!   	<!-- Install ccmtools -->
! 
! 	<target name="install"  depends="jar.ccmtools" description="Install ccmtools to prefix/.">
        	<mkdir dir="${prefix}" />
! 
!   		<copy todir="${prefix}/lib" overwrite="true"> <fileset dir="${lib}"/> </copy>
        	<copy todir="${prefix}/templates" overwrite="true"> <fileset dir="${src}/templates"/> </copy>
        	<copy todir="${prefix}/idl" overwrite="true"> <fileset dir="${idl}"/> </copy>
        	<copy todir="${prefix}/etc" overwrite="true"> <fileset dir="${etc}"/> </copy>
- 
        	<copy todir="${prefix}/bin" overwrite="true"> <fileset dir="${bin}"/> </copy>
!   		<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools"/>      </exec>
    		<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmjava"/>       </exec>
    		<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmidl"/>        </exec>
--- 153,179 ----
  
  
!   	<!-- 
!   		Install ccmtools 
!   	-->
! 	<target name="install.copy"  depends="jar.ccmtools" 
! 		description="Install ccmtools to prefix/.">
        	<mkdir dir="${prefix}" />
! 		<copy todir="${prefix}/lib" overwrite="true"> 
! 			<fileset dir="${lib}">
! 				<include name="ccmtools.jar"/>
! 				<include name="commons-cli-1.0.jar"/>
! 				<include name="java-cup-11a.jar"/>
! 				<include name="antlr.jar"/>
! 				<include name="jdom.jar"/>					
! 			</fileset>	
!   		</copy>
        	<copy todir="${prefix}/templates" overwrite="true"> <fileset dir="${src}/templates"/> </copy>
        	<copy todir="${prefix}/idl" overwrite="true"> <fileset dir="${idl}"/> </copy>
        	<copy todir="${prefix}/etc" overwrite="true"> <fileset dir="${etc}"/> </copy>
        	<copy todir="${prefix}/bin" overwrite="true"> <fileset dir="${bin}"/> </copy>
!   	</target>
! 	
! 	<target name="install.setup" depends="install.copy" if="isUnix">
! 		<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools"/>      </exec>
    		<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmjava"/>       </exec>
    		<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmidl"/>        </exec>
***************
*** 141,149 ****
    		<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmdescriptor"/> </exec>
        	<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools-idl"/>  </exec>
!   	</target>
! 
! 
!   	<!-- Generate JavaDoc -->
  
  	<target name="javadoc" depends="javadoc.ccmtools, javadoc.uml2idl"/>
  
--- 183,199 ----
    		<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmdescriptor"/> </exec>
        	<exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools-idl"/>  </exec>
! 	</target>
  
+ 	<target name="install.doc" >
+       	<mkdir dir="${prefix}/doc" />
+ 		<copy file="${doc}/manual/CcmtoolsManual.pdf" todir="${prefix}/doc" overwrite="true"/> 
+   	</target>
+ 		
+ 	<target name="install" depends="install.doc,install.setup"></target>	
+   	
+ 	
+ 	<!-- 
+ 		Generate JavaDoc 
+ 	-->
  	<target name="javadoc" depends="javadoc.ccmtools, javadoc.uml2idl"/>
  
***************
*** 159,164 ****
  
  
!   	<!-- Run test cases -->
! 
  	<target name="test" depends="compile.tests, test.idl.parser, test.java.components, test.cpp.components"/>
  
--- 209,215 ----
  
  
!   	<!-- 
!   		Run test cases 
!   	-->
  	<target name="test" depends="compile.tests, test.idl.parser, test.java.components, test.cpp.components"/>
  
***************
*** 194,215 ****
    	</target>
  
- 
- 	<!-- Clean up -->
- 
-   	<target name="clean" description="Clean up the build and lib directory." >
- 
-       	<delete file="${src}/${PACKAGE}/Constants.java" />
- 
-       	<delete file="${src}/ccmtools/parser/idl3/Idl3Lexer.java" />
-       	<delete file="${src}/ccmtools/parser/idl3/Idl3Parser.java" />
-       	<delete file="${src}/ccmtools/parser/idl3/Idl3TokenTypes.java" />
-       	<delete file="${src}/ccmtools/parser/idl3/Idl3TokenTypes.txt" />
- 
-   		<delete dir="${src}/uml_parser" />
-       	<delete dir="${src-gen}" />
-       	<delete dir="${build}" />
-       	<delete dir="${test}/CppRemoteGenerator/sandbox" />
-       	<delete file="${lib}/ccmtools.jar" />
-   	</target>
- 
  </project>
--- 245,247 ----

[ccmtools-cvs] ccmtools/test/JavaRemoteComponents/facet_simple Makefile.xml, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaRemoteComponents/facet_simple
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21449/test/JavaRemoteComponents/facet_simple

Added Files:
	Makefile.xml 
Log Message:
Added Makefile.xml to show the usage of the new ant tasks for ccmtools and idlj.

--- NEW FILE: Makefile.xml ---
<?xml version="1.0" encoding="ISO-8859-1"?>

<project name="FacetSimplExample" basedir="." default="check">

	<property environment="env"/>
	<property name="ccmtools.home" location="${env.CCMTOOLS_HOME}"/>
	<property name="dest.dir" location="xxx"/>
	<property name="idl3.dir" location="${dest.dir}/idl3"/>
	<property name="idl2.dir" location="${dest.dir}/idl2"/>
	<property name="src" location="${dest.dir}/src"/>
	<property name="src.gen" location="${dest.dir}/src-gen"/>
	<property name="src.client" location="src"/>	
	<property name="src.impl" location="impl"/>	
	<property name="build" location="${dest.dir}/build" />
	<property name="bin" location="bin" />
		
	<path id="compile.classpath">
		<fileset dir="${ccmtools.home}/lib" includes="*.jar"/>
		<pathelement path="${build}" />
	</path>
	
	<taskdef name="ccmtools" classname="ccmtools.ant.CcmtoolsTask" >
		<classpath refid="compile.classpath" />  
	</taskdef>

	<taskdef name="idlj" classname="ccmtools.ant.IdljTask" >
		<classpath refid="compile.classpath" />  
	</taskdef>

	
	<target name="init" description="" >
		<mkdir dir="${build}" />
	</target>
	
	<target name="clean" description="" >
		<delete dir="${dest.dir}" />
	</target>
	
	
	<!--
		Generate IDL3 repository directory
	-->
	<target name="idl3repo">		
		<ccmtools generator="model.validator" >
			<fileset dir="." includes="*.idl" />
		</ccmtools>	

		<ccmtools generator="idl3" destdir="${idl3.dir}">
			<fileset dir="." includes="*.idl" />
		</ccmtools>	
	</target>

	
	<!--
		Generate a local Java component.
	-->
	<target name="local" depends="idl3repo">		
		<ccmtools generator="java.iface" destdir="${src.gen}">
			<include path="${idl3.dir}/interface:${idl3.dir}/component" /> 
			<fileset dir="${idl3.dir}" includes="**/*.idl" />
		</ccmtools>	

		<ccmtools generator="java.local" destdir="${src.gen}">
			<include path="${idl3.dir}/interface:${idl3.dir}/component" /> 
			<fileset dir="${idl3.dir}" includes="**/*.idl" />
		</ccmtools>	

		<ccmtools generator="java.app" destdir="${src}">
			<include path="${idl3.dir}/interface:${idl3.dir}/component" /> 
			<fileset dir="${idl3.dir}/component" includes="**/*.idl" />
		</ccmtools>	
	</target>
	
	
	<!--
		Generate a remote Java component.
	-->
	<target name="remote" depends="local">		
		<ccmtools generator="idl2" destdir="${idl2.dir}">
			<include path="${idl3.dir}/interface:${idl3.dir}/component" /> 
			<fileset dir="${idl3.dir}" includes="**/*.idl" />
		</ccmtools>	
	
		<idlj destdir="${src.gen}">
			<include path="${ccmtools.home}/idl:${idl2.dir}" /> 
			<fileset dir="${idl2.dir}" includes="*.idl" />
		</idlj>
					
		<ccmtools generator="java.remote" destdir="${src.gen}">
			<include path="${idl3.dir}/interface:${idl3.dir}/component" /> 
			<fileset dir="${idl3.dir}" includes="**/*.idl" />
		</ccmtools>			

		<ccmtools generator="java.clientlib" destdir="${src.gen}">
			<include path="${idl3.dir}/interface:${idl3.dir}/component" /> 
			<fileset dir="${idl3.dir}" includes="**/*.idl" />
		</ccmtools>				
	</target>
	
	
	<!--
		Check
	-->
	<target name="check" depends="init, remote">
		<copy todir="${src}/world" overwrite="true"> 
			<fileset dir="${src.impl}" includes="*.java" />
  		</copy>

		<javac srcdir="${src.gen}:${src}:${src.client}" destdir="${build}" 
	             debug="on" source="1.5" target="1.5">
	    	<classpath refid="compile.classpath" />  
	    </javac>
		
		<java classname="Client" classpathref="compile.classpath" failonerror="true"/>
		
		<java classname="Client" classpathref="compile.classpath" failonerror="true">
			<arg value="-ORBInitRef"/>
			<arg value="NameService=corbaloc:iiop:1.2@localhost:5050/NameService"/>
			<arg value="-ORBServerHost"/>
			<arg value="localhost"/>
		</java>
	</target>
</project>

[ccmtools-cvs] ccmtools/src/ccmtools/ant IncludePath.java, NONE, 1.1 GeneratorType.java, NONE, 1.1 IdljTask.java, NONE, 1.1 BindingType.java, NONE, 1.1 CcmtoolsTask.java, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21088/src/ccmtools/ant

Added Files:
	IncludePath.java GeneratorType.java IdljTask.java 
	BindingType.java CcmtoolsTask.java 
Log Message:
Added ant tasks for ccmtools and idlj.

--- NEW FILE: IdljTask.java ---
package ccmtools.ant;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Execute;
import org.apache.tools.ant.taskdefs.LogStreamHandler;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.FileSet;

public class IdljTask
    extends Task
{    
    /** 
     * Handle attribute keep 
     * If a file to be generated already exists, do not overwrite it.  
     * By default it is overwritten.
     */
    private boolean keep = false;
    public void setKeep(boolean keep)
    {
        this.keep = keep;
    }
    
    
    /** 
     * Handle attribute emitAll 
     * Emit all types, including those found in #included files.
     */
    private boolean emitAll = false;
    public void setEmitAll(boolean emitAll)
    {
        this.emitAll = emitAll;
    }

    
    /** 
     * Handle attribute noWarn 
     * Suppress warnings.
     */
    private boolean noWarn = false;
    public void setNoWarn(boolean noWarn)
    {
        this.noWarn = noWarn;
    }

    
    /** 
     * Handle attribute oldImplBase
     * 
     */
    private boolean oldImplBase = false;
    public void setOldImplBase(boolean oldImplBase)
    {
        this.oldImplBase = oldImplBase;
    }

    
    /** 
     * Handle attribute verbose
     * 
     */
    private boolean verbose = false;
    public void setVerbose(boolean verbose)
    {
        this.verbose = verbose;
    }

    
    /** 
     * Handle attribute skeletonName
     * 
     */
    private String skeletonName;
    public void setSkeletonName(String skeletonName)
    {
        this.skeletonName = skeletonName;
    }

        
    /** 
     * Handle attribute tieName
     * 
     */
    private String tieName;
    public void setTieName(String tieName)
    {
        this.tieName = tieName;
    }
    
    
    /** 
     * Handle attribute binding 
     * 
     */
    private String binding = "fall";
    public void setBinding(BindingType binding)
    {
        this.binding = binding.getValue();
    }

    
    /** 
     * Handle attribute destdir 
     *
     */
    private File destDir = new File("./");
    public void setDestdir(File destDir)
    {
        this.destDir = destDir;
    }

    
    /** 
     * Handle nested <include> elements 
     * 
     */
    private List<String> includePaths = new ArrayList<String>();
    private List<IncludePath> includes = new ArrayList<IncludePath>();
    public IncludePath createInclude()
    {
        IncludePath p = new IncludePath();
        includes.add(p);
        return p;
    }

    
    /** 
     * Handle file sets 
     * 
     */
    private List<FileSet> filesets = new ArrayList<FileSet>();
    
    public void addFileset(FileSet fileset)
    {
        filesets.add(fileset);
    }
    

    public void execute()
    {
        for(IncludePath p : includes)
        {
            includePaths.addAll(Arrays.asList(p.getPaths()));
        }

        logTask();
    
        for(FileSet fs: filesets)
        {
            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
            String[] includedFiles = ds.getIncludedFiles();
            for(int i=0; i<includedFiles.length; i++)
            {
                File file = new File(ds.getBasedir(),includedFiles[i]);
                runIdlCompiler(file);
            }            
        }        
    }

    
    public void runIdlCompiler(File idlFile)
    {
        // Construct the command line 
        Commandline cmdline = new Commandline();
        cmdline.setExecutable("idlj");
        if(keep)
        {
            cmdline.createArgument().setValue("-keep");
        }
        if(emitAll)
        {
            cmdline.createArgument().setValue("-emitAll");
        }
        if(noWarn)
        {
            cmdline.createArgument().setValue("-noWarn");
        }
        if(oldImplBase)
        {
            cmdline.createArgument().setValue("-oldImplBase");
        }
        if(verbose)
        {
            cmdline.createArgument().setValue("-verbose");
        }
        if(skeletonName != null)
        {
            cmdline.createArgument().setLine("-skeletonName " + skeletonName);
        }
        if(tieName != null)
        {
            cmdline.createArgument().setLine("-tieName " + tieName);
        }
        
        
        cmdline.createArgument().setValue("-" + binding);
        cmdline.createArgument().setLine("-td " + destDir.getAbsolutePath());
        for(String s : includePaths)
        {
            cmdline.createArgument().setLine("-i " + s);
        }
        cmdline.createArgument().setValue(idlFile.getAbsolutePath());
        log("command line = " + cmdline, Project.MSG_VERBOSE);
        
        // Configure the Execute object
        LogStreamHandler streamHandler = new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN);
        Execute runner = new Execute(streamHandler, null);
        runner.setAntRun(getProject());
        runner.setCommandline(cmdline.getCommandline());
        
        // Execute the command line
        int result = 0;
        try
        {
            log("compile " + idlFile.getAbsolutePath());
            result = runner.execute();
            log("result = " + result, Project.MSG_VERBOSE);
        }
        catch(IOException e)
        {
            log(e.getMessage(), Project.MSG_DEBUG);
            throw new BuildException(e.getMessage());
        }                
    }
    
    
    public void logTask()
    {
        // Log ant task parameters
        log("attribute keep = " + keep, Project.MSG_VERBOSE);
        log("attribute emitAll = " + emitAll, Project.MSG_VERBOSE);
        log("attribute noWarn = " + noWarn, Project.MSG_VERBOSE);
        log("attribute oldImplBase = " + oldImplBase, Project.MSG_VERBOSE);
        log("attribute verbose = " + verbose, Project.MSG_VERBOSE);
        log("attribute skeletonName = " + skeletonName, Project.MSG_VERBOSE);
        log("attribute tieName = " + tieName, Project.MSG_VERBOSE);
                
        log("attribute binding = " + binding, Project.MSG_VERBOSE);
        
        if(destDir != null)
            log("attribute destdir = " + destDir.getAbsolutePath(), Project.MSG_VERBOSE);
            
        for(String s : includePaths)
        {
            log("nested element include = " + s, Project.MSG_VERBOSE);
        }
        
        for(FileSet fs: filesets)
        {
            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
            String[] includedFiles = ds.getIncludedFiles();
            for(int i=0; i<includedFiles.length; i++)
            {
                File file = new File(ds.getBasedir(),includedFiles[i]);
                log("nested element fileset = " + file.getAbsolutePath(), Project.MSG_VERBOSE);
            }            
        }
    }
}

--- NEW FILE: CcmtoolsTask.java ---
package ccmtools.ant;

import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;

public class CcmtoolsTask
    extends Task
{        
    /** 
     * Handle attribute generator 
     * 
     */
    private String generator;
    public void setGenerator(GeneratorType generator)
    {
        this.generator=generator.getValue();
    }
            
    
    /** 
     * Handle attribute destdir 
     * 
     */
    private File destDir = new File("./");
    public void setDestdir(File destDir)
    {
        this.destDir = destDir;
    }

    
    /** 
     * Handle nested includepath elements 
     * 
     */
    private List<String> includePaths;
    private List<IncludePath> includes = new ArrayList<IncludePath>();
    public IncludePath createInclude()
    {
        IncludePath p = new IncludePath();
        includes.add(p);
        return p;
    }

    
    /** 
     * Handle file sets 
     * 
     */
    private List<FileSet> filesets = new ArrayList<FileSet>();    
    public void addFileset(FileSet fileset)
    {
        filesets.add(fileset);
    }
    

    public void execute()
    {
        includePaths = new ArrayList<String>();
        for(IncludePath p : includes)
        {
            includePaths.addAll(Arrays.asList(p.getPaths()));
        }
        
        logTask();
        
        // Setup ccmtools properties
        String home = getProject().getProperty("ccmtools.home");
        if(home == null)
        {
            throw new BuildException("ccmtools.home property is not set!");
        }
        System.setProperty("ccmtools.home", home);
        System.setProperty("java.util.logging.config.file", 
                home + File.separator + "etc" + File.separator + "logging.properties");            

        
        // Call ccmtools generators
        if(generator.startsWith("model"))
        {
            executeModelTools();
        }
        else if(generator.startsWith("idl"))
        {
            executeIdlGenerator();
        }
        else if(generator.startsWith("java"))
        {
            executeJavaGenerator();
        }
    }

    
    protected void executeModelTools()
    {
        StringBuilder cmd = new StringBuilder();
        
        if(generator.equals("model.validator"))
        {
            cmd.append("-validator");
        }
        else if(generator.equals("model.parser"))
        {
            cmd.append("-parser");
        }
         
        
        for(String s : includePaths)
        {
            cmd.append(" -I" + s);
        }        
        
        for(FileSet fs: filesets)
        {
            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
            String[] includedFiles = ds.getIncludedFiles();
            for(int i=0; i<includedFiles.length; i++)
            {
                File file = new File(ds.getBasedir(),includedFiles[i]);
                cmd.append(" ").append(file.getAbsolutePath());
            }            
        }
        
        log("command line = " + cmd.toString(), Project.MSG_VERBOSE);
        String[] args = cmd.toString().split(" ");
        ccmtools.parser.idl.metamodel.Main.main(args);                
    }
    
    
    protected void executeIdlGenerator()
    {
        StringBuilder cmd = new StringBuilder();
        
        if(generator.equals("idl3"))
        {
            cmd.append("-idl3");
        }
        else if(generator.equals("idl3.mirror"))
        {
            cmd.append("-idl3mirror");
        }
        else if(generator.equals("idl2"))
        {
            cmd.append("-idl2");
        }
            

        for(String s : includePaths)
        {
            cmd.append(" -I" + s);
        }
        
        cmd.append(" -o " + destDir.getAbsolutePath());

        for(FileSet fs: filesets)
        {
            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
            String[] includedFiles = ds.getIncludedFiles();
            for(int i=0; i<includedFiles.length; i++)
            {
                File file = new File(ds.getBasedir(),includedFiles[i]);
                cmd.append(" ").append(file.getAbsolutePath());
            }            
        }
        
        log("command line = " + cmd.toString(), Project.MSG_VERBOSE);
        String[] args = cmd.toString().split(" ");
        ccmtools.generator.idl.Main.main(args);                
    }


    protected void executeJavaGenerator()
    {
        StringBuilder cmd = new StringBuilder();
        
        if(generator.equals("java.iface"))
        {
            cmd.append("-iface");
        }
        else if(generator.equals("java.local"))
        {
            cmd.append("-local");
        }
        else if(generator.equals("java.app"))
        {
            cmd.append("-app");
        }
        else if(generator.equals("java.remote"))
        {
            cmd.append("-remote");
        }
        else if(generator.equals("java.clientlib"))
        {
            cmd.append("-clientlib");
        }
            
        
        for(String s : includePaths)
        {
            cmd.append(" -I" + s);
        }
        
        cmd.append(" -o " + destDir.getAbsolutePath());
        
        for(FileSet fs: filesets)
        {
            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
            String[] includedFiles = ds.getIncludedFiles();
            for(int i=0; i<includedFiles.length; i++)
            {
                File file = new File(ds.getBasedir(),includedFiles[i]);
                cmd.append(" ").append(file.getAbsolutePath());
            }            
        }
        
        log("command line = " + cmd.toString(), Project.MSG_VERBOSE);
        String[] args = cmd.toString().split(" ");
        ccmtools.generator.java.Main.main(args);                
    }

    
    public void logTask()
    {
        // Log ant task parameters
        String home = getProject().getProperty("ccmtools.home");
        log("property ccmtools.home = " + home, Project.MSG_VERBOSE);        
        log("attribute generator =  " + generator, Project.MSG_VERBOSE);
        if(destDir != null)
            log("attribute destdir = " + destDir.getAbsolutePath(), Project.MSG_VERBOSE);
            
        List<String> includePaths = new ArrayList<String>();
        for(IncludePath p : includes)
        {
            includePaths.addAll(Arrays.asList(p.getPaths()));
        }
        for(String s : includePaths)
        {
            log("nested element include = " + s, Project.MSG_VERBOSE);
        }
    }
}

--- NEW FILE: BindingType.java ---
package ccmtools.ant;

import org.apache.tools.ant.types.EnumeratedAttribute;

public class BindingType
    extends EnumeratedAttribute
{

    public String[] getValues()
    {
        return new String[]  
        {
                "fclient",
                "fserver",
                "fserverTIE",
                "fall",
                "fallTIE",
        };        
    }
}

--- NEW FILE: IncludePath.java ---
package ccmtools.ant;

import org.apache.tools.ant.types.Path;

public class IncludePath
{
    
    public String[] getPaths()
    {
        return path.list();
    }

    /** Handle path attribute */
    private Path path;
    public void setPath(Path path)
    {
        this.path = path;
    }
            
            
    public String toString()
    {
        return path.toString();
    }
}

--- NEW FILE: GeneratorType.java ---
package ccmtools.ant;

import org.apache.tools.ant.types.EnumeratedAttribute;

public class GeneratorType
    extends EnumeratedAttribute
{

    public String[] getValues()
    {
        return new String[]  
        {
                // ccmtools.parser.idl.metamodel
                "model.validator",
                "model.parser",
                
                // ccmtools.generator.idl
                "idl3",
                "idl3.mirror",
                "idl2",
                
                // ccmtools.generator.java
                "java.iface",
                "java.local",
                "java.app",
                "java.remote",
                "java.clientlib",
                
                // ccmtools.generator.deployment
                "descriptor"
        };        
    }
}

[ccmtools-cvs] ccmtools/src/ccmtools/ant - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/ant
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19930/src/ccmtools/ant

Log Message:
Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/ant added to the repository

[ccmtools-cvs] ccmtools/src/templates/CppLocalTemplates MHomeDef, 1.26, 1.27

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13338/src/templates/CppLocalTemplates

Modified Files:
	MHomeDef 
Log Message:
C++ generator:

*) the local "_entry.h" files are now C-compatible
*) the local deploy/undeploy functions are now "extern C"

Index: MHomeDef
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MHomeDef,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** MHomeDef	23 Mar 2007 11:03:43 -0000	1.26
--- MHomeDef	5 Apr 2007 12:22:28 -0000	1.27
***************
*** 294,297 ****
--- 294,299 ----
  #define __HOME_%(PreprocIdentifier)s_ENTRY__H__
  
+ #ifdef __cplusplus
+ 
  #include <Components/ccmtools.h>
  
***************
*** 306,315 ****
      ::Components::AssemblyFactory::SmartPtr assembly_factory);
  
! /// deploy the implementation of %(Identifier)s 
! int deploy_%(AbsoluteLocalHomeName)s(char* name);
  
  int undeploy_%(AbsoluteLocalHomeName)s(char* name);
  
! #endif // __HOME_%(PreprocIdentifier)s_ENTRY__H__
  
  
--- 308,322 ----
      ::Components::AssemblyFactory::SmartPtr assembly_factory);
  
! extern "C" {
! #endif
  
+ int deploy_%(AbsoluteLocalHomeName)s(char* name);
  int undeploy_%(AbsoluteLocalHomeName)s(char* name);
  
! #ifdef __cplusplus
! }
! #endif
! 
! #endif /* __HOME_%(PreprocIdentifier)s_ENTRY__H__ */
  
  

[ccmtools-cvs] ccmtools/test/JavaLocalComponents/component_assembly_nested Makefile, 1.5, 1.6

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/JavaLocalComponents/component_assembly_nested
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3903/test/JavaLocalComponents/component_assembly_nested

Modified Files:
	Makefile 
Log Message:
#

Index: Makefile
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/JavaLocalComponents/component_assembly_nested/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	10 Jan 2007 16:19:17 -0000	1.5
--- Makefile	5 Apr 2007 11:57:13 -0000	1.6
***************
*** 15,19 ****
  	ccmjava -iface -local -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/interface/world/*.idl
  	ccmjava -iface -local -o ${DEST_DIR}/src-gen ${INCLUDE} ${IDL3_DIR}/component/world/*.idl
- 
  	ccmjava -app -o ${DEST_DIR}/src ${INCLUDE} ${IDL3_DIR}/component/world/*.idl
  
--- 15,18 ----

[ccmtools-cvs] ccmtools/src/ccmtools/CppGenerator CppLocalGenerator.java, 1.54.2.1, 1.54.2.2

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23327/src/ccmtools/CppGenerator

Modified Files:
      Tag: RELEASE-0_8-BRANCH
	CppLocalGenerator.java 
Log Message:
bug fix: wrong default ctor with structures


Index: CppLocalGenerator.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppLocalGenerator.java,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -C2 -d -r1.54.2.1 -r1.54.2.2
*** CppLocalGenerator.java	25 Jan 2007 17:37:20 -0000	1.54.2.1
--- CppLocalGenerator.java	28 Mar 2007 16:42:26 -0000	1.54.2.2
***************
*** 1,18 ****
  /*
!  * CCM Tools : C++ Code Generator Library 
   * Leif Johnson <le...@am...>
!  * Egon Teiniker <ego...@sa...> 
   * Copyright (C) 2002 - 2007 ccmtools.sf.net
!  * 
   * This library 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.
[...1529 lines suppressed...]
      {
--- 1330,1334 ----
          return code.toString();
      }
! 
      public String getOperationReturn(MOperationDef op)
      {
***************
*** 1356,1360 ****
              code = "return ";
          }
!         else {	
              code = "";
          }
--- 1339,1343 ----
              code = "return ";
          }
!         else {
              code = "";
          }

[ccmtools-cvs] ccmtools/src/ccmtools/CppGenerator CppLocalGenerator.java, 1.59, 1.60

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21733/src/ccmtools/CppGenerator

Modified Files:
	CppLocalGenerator.java 
Log Message:
bug fix: wrong default ctor for structures

Index: CppLocalGenerator.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppLocalGenerator.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** CppLocalGenerator.java	26 Feb 2007 15:30:14 -0000	1.59
--- CppLocalGenerator.java	28 Mar 2007 16:37:27 -0000	1.60
***************
*** 32,36 ****
  import java.util.Set;
  import java.util.logging.Logger;
- 
  import ccmtools.CcmtoolsException;
  import ccmtools.CodeGenerator.Template;
--- 32,35 ----
***************
*** 1219,1239 ****
      protected String generateDefaultValue(MIDLType type)
      {
!         if(type instanceof MInterfaceDef)
!         {
!             MInterfaceDef iface = (MInterfaceDef)type;
!             return getLocalCxxName(iface,Text.SCOPE_SEPARATOR) + "::SmartPtr()";
!         }
!         else if(type instanceof MEnumDef)
          {
!             MEnumDef enumeration = (MEnumDef)type;            
              return enumeration.getMember(0); // Set enum to the first value.
          }
          else if(type instanceof MAliasDef)
          {
-             MAliasDef alias = (MAliasDef)type;
              MIDLType idlType = ((MTyped)type).getIdlType();
              if(idlType instanceof MSequenceDef)
              {
!                 return getLocalCxxName(alias, Text.SCOPE_SEPARATOR) + "()";
              }
              else
--- 1218,1232 ----
      protected String generateDefaultValue(MIDLType type)
      {
!         if(type instanceof MEnumDef)
          {
!             MEnumDef enumeration = (MEnumDef)type;
              return enumeration.getMember(0); // Set enum to the first value.
          }
          else if(type instanceof MAliasDef)
          {
              MIDLType idlType = ((MTyped)type).getIdlType();
              if(idlType instanceof MSequenceDef)
              {
!                 return null;
              }
              else
***************
*** 1242,1253 ****
              }
          }
-         else if(type instanceof MStringDef)
-         {
-             return "\"\"";
-         }
-         else if(type instanceof MWstringDef)
-         {
-             return "L\"\"";
-         }
          else if(type instanceof MPrimitiveDef)
          {
--- 1235,1238 ----
***************
*** 1257,1268 ****
          return null;
      }
!     
      protected String generateDefaultValue(MPrimitiveDef primitive)
      {
!         if(primitive.getKind() == MPrimitiveKind.PK_ANY)
!         {
!             return " ::wamas::platform::utils::SmartPtr< ::wamas::platform::utils::Value>()";
!         }
!         else if(primitive.getKind() == MPrimitiveKind.PK_BOOLEAN)
          {
              return "false";
--- 1242,1249 ----
          return null;
      }
! 
      protected String generateDefaultValue(MPrimitiveDef primitive)
      {
!         if(primitive.getKind() == MPrimitiveKind.PK_BOOLEAN)
          {
              return "false";

[ccmtools-cvs] ccmtools/test/CppRemoteGenerator/receptacle_simple/impl _check_ccmtools_remote_Test.cc, 1.1, 1.2

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_simple/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24759/test/CppRemoteGenerator/receptacle_simple/impl

Modified Files:
	_check_ccmtools_remote_Test.cc 
Log Message:
C++: the local home adapter has no longer a dependency to the home's implementation

Index: _check_ccmtools_remote_Test.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_simple/impl/_check_ccmtools_remote_Test.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _check_ccmtools_remote_Test.cc	5 Jan 2007 18:58:46 -0000	1.1
--- _check_ccmtools_remote_Test.cc	23 Mar 2007 14:15:07 -0000	1.2
***************
*** 1,18 ****
  /***
!  * CCM Tools Test Client 
   *
   * This file was automatically generated by CCM Tools
   *         <http://ccmtools.sourceforge.net/>
   *
!  * This test client is part of the remote component test concept. 
   ***/
  
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
! #endif 
  
! #ifdef HAVE_MICO 
  
! #include <cstdlib> 
  #include <iostream>
  #include <string>
--- 1,18 ----
  /***
!  * CCM Tools Test Client
   *
   * This file was automatically generated by CCM Tools
   *         <http://ccmtools.sourceforge.net/>
   *
!  * This test client is part of the remote component test concept.
   ***/
  
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
! #endif
  
! #ifdef HAVE_MICO
  
! #include <cstdlib>
  #include <iostream>
  #include <string>
***************
*** 23,26 ****
--- 23,27 ----
  #include <coss/CosNaming.h>
  
+ #include <TestHome_entry.h>
  #include <ccmtools/remote/TestHome_remote.h>
  #include <ccmtools_corba_Test.h>
***************
*** 36,60 ****
      cout << "Enter C++ remote test client" << endl;
  
!     // Initialize ORB 
      int argc_ = 3;
!     char* argv_[] = { "", "-ORBInitRef", "NameService=corbaloc:iiop:1.2@localhost:5050/NameService" }; 
      CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
!     
      /*
       * Server-side code
!      */ 
  
!     // Register all value type factories with the ORB  
      ::ccmtools::remote::register_all_factories(orb);
  
!     // Deploy local and remote component homes	
      int error = 0;
      error += deploy_TestHome("TestHome");
      error += deploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error) 
      {
          cout << "TestHome server is running..." << endl;
      }
!     else 
      {
          cerr << "ERROR: Can't deploy components!" << endl;
--- 37,61 ----
      cout << "Enter C++ remote test client" << endl;
  
!     // Initialize ORB
      int argc_ = 3;
!     char* argv_[] = { "", "-ORBInitRef", "NameService=corbaloc:iiop:1.2@localhost:5050/NameService" };
      CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
! 
      /*
       * Server-side code
!      */
  
!     // Register all value type factories with the ORB
      ::ccmtools::remote::register_all_factories(orb);
  
!     // Deploy local and remote component homes
      int error = 0;
      error += deploy_TestHome("TestHome");
      error += deploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error)
      {
          cout << "TestHome server is running..." << endl;
      }
!     else
      {
          cerr << "ERROR: Can't deploy components!" << endl;
***************
*** 62,68 ****
      }
  
!     // For testing we use CORBA collocation	
      // orb->run();
! 	
  
      /**
--- 63,69 ----
      }
  
!     // For testing we use CORBA collocation
      // orb->run();
! 
  
      /**
***************
*** 72,76 ****
      CosNaming::NamingContextExt_var nc = CosNaming::NamingContextExt::_narrow(obj);
  
!     // Deployment 
  
      // Find ComponentHomes in the Naming-Service
--- 73,77 ----
      CosNaming::NamingContextExt_var nc = CosNaming::NamingContextExt::_narrow(obj);
  
!     // Deployment
  
      // Find ComponentHomes in the Naming-Service
***************
*** 81,94 ****
      ::ccmtools::corba::Test_var myTest = myTestHome->create();
  
!     // Provide facets   
      ::ccmtools::corba::I2_var in_port = myTest->provide_in_port();
  
      // Connect receptacle
      myTest->connect_out_port(in_port);
! 	
      myTest->configuration_complete();
  
      cout << "==== Begin Test Case ===================================" << endl;
!     cout << "==== End Test Case =====================================" << endl; 
  
      // Destroy component instances
--- 82,95 ----
      ::ccmtools::corba::Test_var myTest = myTestHome->create();
  
!     // Provide facets
      ::ccmtools::corba::I2_var in_port = myTest->provide_in_port();
  
      // Connect receptacle
      myTest->connect_out_port(in_port);
! 
      myTest->configuration_complete();
  
      cout << "==== Begin Test Case ===================================" << endl;
!     cout << "==== End Test Case =====================================" << endl;
  
      // Destroy component instances
***************
*** 99,103 ****
      error += undeploy_TestHome("TestHome");
      error += undeploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(error) 
      {
          cerr << "ERROR: Can't undeploy components!" << endl;
--- 100,104 ----
      error += undeploy_TestHome("TestHome");
      error += undeploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(error)
      {
          cerr << "ERROR: Can't undeploy components!" << endl;
***************
*** 107,111 ****
      {
      		cout << "Exit C++ remote test client" << endl;
!     } 	
  }
  
--- 108,112 ----
      {
      		cout << "Exit C++ remote test client" << endl;
!     }
  }
  

[ccmtools-cvs] ccmtools/test/CppRemoteGenerator/facet_inheritance/impl _check_ccm_remote_Test.cc, 1.6, 1.7

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_inheritance/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24759/test/CppRemoteGenerator/facet_inheritance/impl

Modified Files:
	_check_ccm_remote_Test.cc 
Log Message:
C++: the local home adapter has no longer a dependency to the home's implementation

Index: _check_ccm_remote_Test.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_inheritance/impl/_check_ccm_remote_Test.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** _check_ccm_remote_Test.cc	5 Jan 2007 18:58:48 -0000	1.6
--- _check_ccm_remote_Test.cc	23 Mar 2007 14:15:07 -0000	1.7
***************
*** 1,18 ****
  /***
!  * CCM Tools Test Client 
   *
!  * This file was automatically generated by CCM Tools 
   *         <http://ccmtools.sourceforge.net/>
   *
!  * This test client is part of the remote component test concept. 
   ***/
  
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
! #endif 
  
! #ifdef HAVE_MICO 
  
! #include <cstdlib> 
  #include <iostream>
  #include <string>
--- 1,18 ----
  /***
!  * CCM Tools Test Client
   *
!  * This file was automatically generated by CCM Tools
   *         <http://ccmtools.sourceforge.net/>
   *
!  * This test client is part of the remote component test concept.
   ***/
  
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
! #endif
  
! #ifdef HAVE_MICO
  
! #include <cstdlib>
  #include <iostream>
  #include <string>
***************
*** 23,26 ****
--- 23,27 ----
  #include <coss/CosNaming.h>
  
+ #include <TestHome_entry.h>
  #include <ccmtools/remote/TestHome_remote.h>
  #include <ccmtools_corba_Test.h>
***************
*** 36,60 ****
      cout << "Enter C++ remote test client" << endl;
  
!     // Initialize ORB 
      int argc_ = 3;
!     char* argv_[] = { "", "-ORBInitRef", "NameService=corbaloc:iiop:1.2@localhost:5050/NameService" }; 
      CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
  
      /**
       * Server-side code
!      */ 
  
!     // Register all value type factories with the ORB  
      ::ccmtools::remote::register_all_factories(orb);
  
!     // Deploy local and remote component homes	
      int error = 0;
      error += deploy_TestHome("TestHome");
      error += deploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error) 
      {
          cout << "TestHome server is running..." << endl;
      }
!     else 
      {
          cerr << "ERROR: Can't deploy components!" << endl;
--- 37,61 ----
      cout << "Enter C++ remote test client" << endl;
  
!     // Initialize ORB
      int argc_ = 3;
!     char* argv_[] = { "", "-ORBInitRef", "NameService=corbaloc:iiop:1.2@localhost:5050/NameService" };
      CORBA::ORB_var orb = CORBA::ORB_init(argc_, argv_);
  
      /**
       * Server-side code
!      */
  
!     // Register all value type factories with the ORB
      ::ccmtools::remote::register_all_factories(orb);
  
!     // Deploy local and remote component homes
      int error = 0;
      error += deploy_TestHome("TestHome");
      error += deploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error)
      {
          cout << "TestHome server is running..." << endl;
      }
!     else
      {
          cerr << "ERROR: Can't deploy components!" << endl;
***************
*** 62,68 ****
      }
  
!     // For testing we use CORBA collocation	
      // orb->run();
! 	
  
      /**
--- 63,69 ----
      }
  
!     // For testing we use CORBA collocation
      // orb->run();
! 
  
      /**
***************
*** 72,76 ****
      CosNaming::NamingContextExt_var nc = CosNaming::NamingContextExt::_narrow(obj);
  
!     // Deployment 
  
      // Find ComponentHomes in the Naming-Service
--- 73,77 ----
      CosNaming::NamingContextExt_var nc = CosNaming::NamingContextExt::_narrow(obj);
  
!     // Deployment
  
      // Find ComponentHomes in the Naming-Service
***************
*** 81,91 ****
      ::ccmtools::corba::Test_var myTest = myTestHome->create();
  
!     // Provide facets   
      ::ccmtools::corba::SubType_var iface = myTest->provide_iface();
! 	
      myTest->configuration_complete();
  
      cout << "==== Begin Test Case ===================================" << endl;
!     
      {
        char* s = CORBA::string_dup("1234567890");
--- 82,92 ----
      ::ccmtools::corba::Test_var myTest = myTestHome->create();
  
!     // Provide facets
      ::ccmtools::corba::SubType_var iface = myTest->provide_iface();
! 
      myTest->configuration_complete();
  
      cout << "==== Begin Test Case ===================================" << endl;
! 
      {
        char* s = CORBA::string_dup("1234567890");
***************
*** 106,110 ****
      }
  
!     cout << "==== End Test Case =====================================" << endl; 
  
      // Destroy component instances
--- 107,111 ----
      }
  
!     cout << "==== End Test Case =====================================" << endl;
  
      // Destroy component instances
***************
*** 114,122 ****
      error  = undeploy_TestHome("TestHome");
      error += undeploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error) 
      {
! 	    cout << "Exit C++ remote test client" << endl; 	
      }
!     else 
      {
          cerr << "ERROR: Can't undeploy components!" << endl;
--- 115,123 ----
      error  = undeploy_TestHome("TestHome");
      error += undeploy_ccmtools_remote_TestHome(orb, "TestHome");
!     if(!error)
      {
! 	    cout << "Exit C++ remote test client" << endl;
      }
!     else
      {
          cerr << "ERROR: Can't undeploy components!" << endl;

[ccmtools-cvs] ccmtools/src/templates/CppRemoteTestTemplates MComponentDef, 1.17, 1.18

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/templates/CppRemoteTestTemplates
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23293/src/templates/CppRemoteTestTemplates

Modified Files:
	MComponentDef 
Log Message:
C++: the local home adapter has no longer a dependency to the home's implementation

Index: MComponentDef
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppRemoteTestTemplates/MComponentDef,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MComponentDef	5 Jan 2007 18:58:51 -0000	1.17
--- MComponentDef	23 Mar 2007 14:11:14 -0000	1.18
***************
*** 23,26 ****
--- 23,27 ----
  #include <coss/CosNaming.h>
  
+ #include <%(AbsoluteLocalHomeName)s_entry.h>
  #include <%(RemoteIncludeNamespace)s%(HomeType)s_remote.h>
  #include <%(StubsIncludeNamespace)s%(Identifier)s.h>

[ccmtools-cvs] ccmtools/test/CppGenerator/attribute_types/impl _check_Test.cc, 1.3, 1.4

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/attribute_types/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17271/test/CppGenerator/attribute_types/impl

Modified Files:
	_check_Test.cc 
Log Message:
C++: the local home adapter has no longer a dependency to the home's implementation

Index: _check_Test.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/attribute_types/impl/_check_Test.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _check_Test.cc	5 Jan 2007 14:17:27 -0000	1.3
--- _check_Test.cc	23 Mar 2007 11:03:43 -0000	1.4
***************
*** 1,4 ****
  /***
!  * CCM Tools Test Client 
   *
   * This file was automatically generated by the CCM Tools.
--- 1,4 ----
  /***
!  * CCM Tools Test Client
   *
   * This file was automatically generated by the CCM Tools.
***************
*** 6,11 ****
   *
   * This test client is part of the mirror component test concept. For each
!  * component a corresponding mirror component will be instantiated. 
!  * All component ports will be connected to the mirror component's ports. 
   * Additionally, developers can add some testing code to validate supported
   * interfaces as well as component attribute access.
--- 6,11 ----
   *
   * This test client is part of the mirror component test concept. For each
!  * component a corresponding mirror component will be instantiated.
!  * All component ports will be connected to the mirror component's ports.
   * Additionally, developers can add some testing code to validate supported
   * interfaces as well as component attribute access.
***************
*** 18,21 ****
--- 18,22 ----
  #include <Components/ccmtools.h>
  
+ #include <TestHome_entry.h>
  #include <TestHome_gen.h>
  
***************
*** 28,32 ****
    	int error = 0;
    	error = deploy_TestHome("TestHome");
!   	if(error) 
    	{
      		cerr << "BOOTSTRAP ERROR: Can't deploy component homes!" << endl;
--- 29,33 ----
    	int error = 0;
    	error = deploy_TestHome("TestHome");
!   	if(error)
    	{
      		cerr << "BOOTSTRAP ERROR: Can't deploy component homes!" << endl;
***************
*** 34,48 ****
    	}
  
!   	try 
    	{
    		Components::HomeFinder* homeFinder = Components::HomeFinder::Instance();
!   		
!     		Test::SmartPtr myTest;	
      		TestHome::SmartPtr myTestHome(dynamic_cast<TestHome*> (
      			homeFinder->find_home_by_name("TestHome").ptr()));
!     		
      		myTest = myTestHome->create();
      		myTest->configuration_complete();
!     		
  	    cout << "== Begin Test Case =============================================" << endl;
  
--- 35,49 ----
    	}
  
!   	try
    	{
    		Components::HomeFinder* homeFinder = Components::HomeFinder::Instance();
! 
!     		Test::SmartPtr myTest;
      		TestHome::SmartPtr myTestHome(dynamic_cast<TestHome*> (
      			homeFinder->find_home_by_name("TestHome").ptr()));
! 
      		myTest = myTestHome->create();
      		myTest->configuration_complete();
! 
  	    cout << "== Begin Test Case =============================================" << endl;
  
***************
*** 52,106 ****
        		short short_result = myTest->short_value();
        		assert(short_result == short_value);
!       
  		    long long_value = -7777;
  		    myTest->long_value(long_value);
  		    long long_result = myTest->long_value();
  		    assert(long_result == long_value);
!       
  			unsigned short ushort_value = 7;
  			myTest->ushort_value(ushort_value);
  			unsigned short ushort_result = myTest->ushort_value();
  			assert(ushort_result == ushort_value);
! 			  
  			unsigned long ulong_value = 7777;
  			myTest->ulong_value(ulong_value);
  			unsigned long ulong_result = myTest->ulong_value();
  			assert(ulong_result == ulong_value);
! 			  
  			float float_value = -77.77;
  			myTest->float_value(float_value);
  			float float_result = myTest->float_value();
  			assert(abs(float_result - float_value) < 0.001);
! 			  
  			double double_value = -77.7777;
  			myTest->double_value(double_value);
  			double double_result = myTest->double_value();
  			assert(abs(double_result - double_value) < 0.001);
! 			  
  			char char_value = 'x';
  			myTest->char_value(char_value);
  			char char_result = myTest->char_value();
  			assert(char_result == char_value);
! 			  
  			string string_value = "0123456789";
  			myTest->string_value(string_value);
  			string string_result = myTest->string_value();
  			assert(string_result == string_value);
! 			 
  			bool boolean_value = true;
  			myTest->boolean_value(boolean_value);
  			bool boolean_result = myTest->boolean_value();
  			assert(boolean_result == boolean_value);
! 			
  			unsigned char octet_value = 0xff;
  			myTest->octet_value(octet_value);
  			unsigned char octet_result = myTest->octet_value();
  			assert(octet_result == octet_value);
! 			
  			wchar_t wchar_value = 'x';
  			myTest->wchar_value(wchar_value);
  			wchar_t wchar_result = myTest->char_value();
  			assert(wchar_result == wchar_value);
! 			  
  			wstring wstring_value = L"0123456789";
  			myTest->wstring_value(wstring_value);
--- 53,107 ----
        		short short_result = myTest->short_value();
        		assert(short_result == short_value);
! 
  		    long long_value = -7777;
  		    myTest->long_value(long_value);
  		    long long_result = myTest->long_value();
  		    assert(long_result == long_value);
! 
  			unsigned short ushort_value = 7;
  			myTest->ushort_value(ushort_value);
  			unsigned short ushort_result = myTest->ushort_value();
  			assert(ushort_result == ushort_value);
! 
  			unsigned long ulong_value = 7777;
  			myTest->ulong_value(ulong_value);
  			unsigned long ulong_result = myTest->ulong_value();
  			assert(ulong_result == ulong_value);
! 
  			float float_value = -77.77;
  			myTest->float_value(float_value);
  			float float_result = myTest->float_value();
  			assert(abs(float_result - float_value) < 0.001);
! 
  			double double_value = -77.7777;
  			myTest->double_value(double_value);
  			double double_result = myTest->double_value();
  			assert(abs(double_result - double_value) < 0.001);
! 
  			char char_value = 'x';
  			myTest->char_value(char_value);
  			char char_result = myTest->char_value();
  			assert(char_result == char_value);
! 
  			string string_value = "0123456789";
  			myTest->string_value(string_value);
  			string string_result = myTest->string_value();
  			assert(string_result == string_value);
! 
  			bool boolean_value = true;
  			myTest->boolean_value(boolean_value);
  			bool boolean_result = myTest->boolean_value();
  			assert(boolean_result == boolean_value);
! 
  			unsigned char octet_value = 0xff;
  			myTest->octet_value(octet_value);
  			unsigned char octet_result = myTest->octet_value();
  			assert(octet_result == octet_value);
! 
  			wchar_t wchar_value = 'x';
  			myTest->wchar_value(wchar_value);
  			wchar_t wchar_result = myTest->char_value();
  			assert(wchar_result == wchar_value);
! 
  			wstring wstring_value = L"0123456789";
  			myTest->wstring_value(wstring_value);
***************
*** 116,121 ****
  			time_t time_result = myTest->typedef_value();
  			assert(time_result == time_value);
! 			 
! 			
  			// Test Case for: enum Color {red, green, blue, black, orange};
  			Color Color_value;
--- 117,122 ----
  			time_t time_result = myTest->typedef_value();
  			assert(time_result == time_value);
! 
! 
  			// Test Case for: enum Color {red, green, blue, black, orange};
  			Color Color_value;
***************
*** 124,132 ****
  			Color Color_result = myTest->enum_value();
  			assert(Color_result == Color_value);
! 			  
! 			
  			// Test Case for: struct Pair { string key; double value; };
  			Pair struct_value;
! 			struct_value.key = "a"; 
  			struct_value.value = 1.0;
  			myTest->struct_value(struct_value);
--- 125,133 ----
  			Color Color_result = myTest->enum_value();
  			assert(Color_result == Color_value);
! 
! 
  			// Test Case for: struct Pair { string key; double value; };
  			Pair struct_value;
! 			struct_value.key = "a";
  			struct_value.value = 1.0;
  			myTest->struct_value(struct_value);
***************
*** 137,141 ****
        		// Test Case for: typedef sequence<Value> map;
        		Map map_value;
!       		for(int i=0;i<5;i++) 
        		{
          			Pair p1;
--- 138,142 ----
        		// Test Case for: typedef sequence<Value> map;
        		Map map_value;
!       		for(int i=0;i<5;i++)
        		{
          			Pair p1;
***************
*** 146,150 ****
        		myTest->sequence_value(map_value);
        		Map map_result = myTest->sequence_value();
!       		for(int i=0;i<(int)map_result.size();i++) 
        		{
          			Pair p = map_result.at(i);
--- 147,151 ----
        		myTest->sequence_value(map_value);
        		Map map_result = myTest->sequence_value();
!       		for(int i=0;i<(int)map_result.size();i++)
        		{
          			Pair p = map_result.at(i);
***************
*** 155,175 ****
  
  	    myTest->remove();
!   	} 
!   	catch (Components::HomeNotFound) 
    	{
      		cout << "DEPLOYMENT ERROR: can't find a home!" << endl;
      		return -1;
!   	} 
!   	catch (Components::NotImplemented& e) 
    	{
      		cout << "DEPLOYMENT ERROR: function not implemented: " << e.what() << endl;
      		return -1;
!   	} 
!   	catch (Components::InvalidName& e) 
    	{
      		cout << "DEPLOYMENT ERROR: invalid name during connection: " << e.what() << endl;
      		return -1;
    	}
!   	catch (...)  
    	{
      		cout << "DEPLOYMENT ERROR: there is something wrong!" << endl;
--- 156,176 ----
  
  	    myTest->remove();
!   	}
!   	catch (Components::HomeNotFound)
    	{
      		cout << "DEPLOYMENT ERROR: can't find a home!" << endl;
      		return -1;
!   	}
!   	catch (Components::NotImplemented& e)
    	{
      		cout << "DEPLOYMENT ERROR: function not implemented: " << e.what() << endl;
      		return -1;
!   	}
!   	catch (Components::InvalidName& e)
    	{
      		cout << "DEPLOYMENT ERROR: invalid name during connection: " << e.what() << endl;
      		return -1;
    	}
!   	catch (...)
    	{
      		cout << "DEPLOYMENT ERROR: there is something wrong!" << endl;
***************
*** 178,182 ****
  
  	error = undeploy_TestHome("TestHome");
!   	if(error) 
    	{
      		cerr << "TEARDOWN ERROR: Can't undeploy component homes!" << endl;
--- 179,183 ----
  
  	error = undeploy_TestHome("TestHome");
!   	if(error)
    	{
      		cerr << "TEARDOWN ERROR: Can't undeploy component homes!" << endl;

[ccmtools-cvs] ccmtools/test/CppGenerator/supports_types/impl _check_Test.cc, 1.3, 1.4

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/supports_types/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17271/test/CppGenerator/supports_types/impl

Modified Files:
	_check_Test.cc 
Log Message:
C++: the local home adapter has no longer a dependency to the home's implementation

Index: _check_Test.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/supports_types/impl/_check_Test.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _check_Test.cc	5 Jan 2007 14:17:27 -0000	1.3
--- _check_Test.cc	23 Mar 2007 11:03:43 -0000	1.4
***************
*** 1,4 ****
  /***
!  * CCM Tools Test Client 
   *
   * This file was automatically generated by the CCM Tools.
--- 1,4 ----
  /***
!  * CCM Tools Test Client
   *
   * This file was automatically generated by the CCM Tools.
***************
*** 6,11 ****
   *
   * This test client is part of the mirror component test concept. For each
!  * component a corresponding mirror component will be instantiated. 
!  * All component ports will be connected to the mirror component's ports. 
   * Additionally, developers can add some testing code to validate supported
   * interfaces as well as component attribute access.
--- 6,11 ----
   *
   * This test client is part of the mirror component test concept. For each
!  * component a corresponding mirror component will be instantiated.
!  * All component ports will be connected to the mirror component's ports.
   * Additionally, developers can add some testing code to validate supported
   * interfaces as well as component attribute access.
***************
*** 18,21 ****
--- 18,22 ----
  #include <Components/ccmtools.h>
  
+ #include <TestHome_entry.h>
  #include <TestHome_gen.h>
  
***************
*** 30,34 ****
    	int error = 0;
    	error = deploy_TestHome("TestHome");
!   	if(error) 
    	{
  		cerr << "BOOTSTRAP ERROR: Can't deploy component homes!" << endl;
--- 31,35 ----
    	int error = 0;
    	error = deploy_TestHome("TestHome");
!   	if(error)
    	{
  		cerr << "BOOTSTRAP ERROR: Can't deploy component homes!" << endl;
***************
*** 36,44 ****
    	}
  
!   	try 
    	{
  		Components::HomeFinder* homeFinder = Components::HomeFinder::Instance();
    		Test::SmartPtr myTest;
!   
      		TestHome::SmartPtr myTestHome(dynamic_cast<TestHome*>(
        		homeFinder->find_home_by_name("TestHome").ptr()));
--- 37,45 ----
    	}
  
!   	try
    	{
  		Components::HomeFinder* homeFinder = Components::HomeFinder::Instance();
    		Test::SmartPtr myTest;
! 
      		TestHome::SmartPtr myTestHome(dynamic_cast<TestHome*>(
        		homeFinder->find_home_by_name("TestHome").ptr()));
***************
*** 46,50 ****
      		myTest = myTestHome->create();
      		myTest->configuration_complete();
!     		
  	    cout << "== Begin Test Case ====================================" << endl;
      		{
--- 47,51 ----
      		myTest = myTestHome->create();
      		myTest->configuration_complete();
! 
  	    cout << "== Begin Test Case ====================================" << endl;
      		{
***************
*** 55,59 ****
        		assert(short_3 == 3);
        		assert(short_r == 3+7);
!       
       		long long_2=3, long_3, long_r;
        		long_r = myTest->op_b2(7,long_2, long_3);
--- 56,60 ----
        		assert(short_3 == 3);
        		assert(short_r == 3+7);
! 
       		long long_2=3, long_3, long_r;
        		long_r = myTest->op_b2(7,long_2, long_3);
***************
*** 61,65 ****
        		assert(long_3 == 3);
        		assert(long_r == 3+7);
!       
       	 	unsigned short ushort_2=3, ushort_3, ushort_r;
        		ushort_r = myTest->op_b3(7,ushort_2, ushort_3);
--- 62,66 ----
        		assert(long_3 == 3);
        		assert(long_r == 3+7);
! 
       	 	unsigned short ushort_2=3, ushort_3, ushort_r;
        		ushort_r = myTest->op_b3(7,ushort_2, ushort_3);
***************
*** 67,71 ****
        		assert(ushort_3 == 3);
        		assert(ushort_r == 3+7);
!       
        		unsigned long ulong_2=3, ulong_3, ulong_r;
        		ulong_r = myTest->op_b4(7,ulong_2, ulong_3);
--- 68,72 ----
        		assert(ushort_3 == 3);
        		assert(ushort_r == 3+7);
! 
        		unsigned long ulong_2=3, ulong_3, ulong_r;
        		ulong_r = myTest->op_b4(7,ulong_2, ulong_3);
***************
*** 73,77 ****
        		assert(ulong_3 == 3);
        		assert(ulong_r == 3+7);
!       
        		float float_2=3.0, float_3, float_r;
        		float_r = myTest->op_b5(7.0,float_2, float_3);
--- 74,78 ----
        		assert(ulong_3 == 3);
        		assert(ulong_r == 3+7);
! 
        		float float_2=3.0, float_3, float_r;
        		float_r = myTest->op_b5(7.0,float_2, float_3);
***************
*** 79,83 ****
        		assert(abs(float_3 - 3.0) < 0.001);
        		assert(abs(float_r - (3.0+7.0)) < 0.001);
!       
        		double double_2=3.0, double_3, double_r;
        		double_r = myTest->op_b6(7.0,double_2, double_3);
--- 80,84 ----
        		assert(abs(float_3 - 3.0) < 0.001);
        		assert(abs(float_r - (3.0+7.0)) < 0.001);
! 
        		double double_2=3.0, double_3, double_r;
        		double_r = myTest->op_b6(7.0,double_2, double_3);
***************
*** 85,89 ****
        		assert(abs(double_3 - 3.0) < 0.000001);
        		assert(abs(double_r - (3.0+7.0)) < 0.000001);
!       
        		char char_2=3, char_3, char_r;
        		char_r = myTest->op_b7(7,char_2, char_3);
--- 86,90 ----
        		assert(abs(double_3 - 3.0) < 0.000001);
        		assert(abs(double_r - (3.0+7.0)) < 0.000001);
! 
        		char char_2=3, char_3, char_r;
        		char_r = myTest->op_b7(7,char_2, char_3);
***************
*** 91,95 ****
        		assert(char_3 == 3);
        		assert(char_r == 3+7);
!       
        		string string_2="drei", string_3, string_r;
        		string_r = myTest->op_b8("sieben",string_2, string_3);
--- 92,96 ----
        		assert(char_3 == 3);
        		assert(char_r == 3+7);
! 
        		string string_2="drei", string_3, string_r;
        		string_r = myTest->op_b8("sieben",string_2, string_3);
***************
*** 97,101 ****
        		assert(string_3 == "drei");
        		assert(string_r == "dreisieben");
!       
        		bool bool_2=false, bool_3, bool_r;
        		bool_r = myTest->op_b9(true, bool_2, bool_3);
--- 98,102 ----
        		assert(string_3 == "drei");
        		assert(string_r == "dreisieben");
! 
        		bool bool_2=false, bool_3, bool_r;
        		bool_r = myTest->op_b9(true, bool_2, bool_3);
***************
*** 109,114 ****
        		assert(uchar_3 == 3);
        		assert(uchar_r == 3+7);
!     		}    
!     
      		{
        		// test case: typedef long time_t;
--- 110,115 ----
        		assert(uchar_3 == 3);
        		assert(uchar_r == 3+7);
!     		}
! 
      		{
        		// test case: typedef long time_t;
***************
*** 118,123 ****
        		assert(time_t_3 == 3);
        		assert(time_t_r == 3+7);
!       
!      		// Test case: enum Color {red, green, blue, black, orange}; 
        		Color Color_2,Color_3, Color_r;
        		Color_2 = Color(blue);
--- 119,124 ----
        		assert(time_t_3 == 3);
        		assert(time_t_r == 3+7);
! 
!      		// Test case: enum Color {red, green, blue, black, orange};
        		Color Color_2,Color_3, Color_r;
        		Color_2 = Color(blue);
***************
*** 135,142 ****
        		assert(Pair_2.key == "a");
        		assert(Pair_r.key == "ab");
!       
        		// Test case: typedef sequence<Value> map;
        		Map map_1, map_2, map_3, map_r;
!       		for(int i=0;i<5;i++) 
        		{
          			Pair p1, p2;
--- 136,143 ----
        		assert(Pair_2.key == "a");
        		assert(Pair_r.key == "ab");
! 
        		// Test case: typedef sequence<Value> map;
        		Map map_1, map_2, map_3, map_r;
!       		for(int i=0;i<5;i++)
        		{
          			Pair p1, p2;
***************
*** 149,163 ****
        		}
        		map_r = myTest->op_u4(map_1,map_2,map_3);
!       		for(unsigned int i=0;i<map_r.size();i++) 
        		{
          			Pair p = map_r.at(i);
          			assert(p.value == (long)i);
        		}
!       		for(unsigned int i=0;i<map_2.size();i++) 
        		{
          			Pair p = map_2.at(i);
          			assert(p.value == (long)i);
        		}
!       		for(unsigned int i=0;i<map_3.size();i++) 
        		{
          			Pair p = map_3.at(i);
--- 150,164 ----
        		}
        		map_r = myTest->op_u4(map_1,map_2,map_3);
!       		for(unsigned int i=0;i<map_r.size();i++)
        		{
          			Pair p = map_r.at(i);
          			assert(p.value == (long)i);
        		}
!       		for(unsigned int i=0;i<map_2.size();i++)
        		{
          			Pair p = map_2.at(i);
          			assert(p.value == (long)i);
        		}
!       		for(unsigned int i=0;i<map_3.size();i++)
        		{
          			Pair p = map_3.at(i);
***************
*** 165,169 ****
        		}
      		}
!   
      		// Test interface types
      		{
--- 166,170 ----
        		}
      		}
! 
      		// Test interface types
      		{
***************
*** 184,216 ****
  
  		myTest->remove();
! 	} 
!   	catch ( Components::HomeNotFound ) 
    	{
      		cout << "DEPLOYMENT ERROR: can't find a home!" << endl;
      		return -1;
!   	} 
!   	catch ( Components::NotImplemented& e ) 
    	{
      		cout << "DEPLOYMENT ERROR: function not implemented: " << e.what (  ) << endl;
      		return -1;
!   	} 
!   	catch ( Components::InvalidName& e ) 
    	{
      		cout << "DEPLOYMENT ERROR: invalid name during connection: " << e.what (  ) << endl;
      		return -1;
    	}
!   	catch ( ... )  
    	{
      		cout << "DEPLOYMENT ERROR: there is something wrong!" << endl;
      		return -1;
    	}
!  
     	error = undeploy_TestHome("TestHome");
!   	if(error) 
    	{
      		cerr << "TEARDOWN ERROR: Can't undeploy component homes!" << endl;
      		return error;
    	}
!   
    	cout << ">>>> Stop Test Client: " << __FILE__ << endl;
  }
--- 185,217 ----
  
  		myTest->remove();
! 	}
!   	catch ( Components::HomeNotFound )
    	{
      		cout << "DEPLOYMENT ERROR: can't find a home!" << endl;
      		return -1;
!   	}
!   	catch ( Components::NotImplemented& e )
    	{
      		cout << "DEPLOYMENT ERROR: function not implemented: " << e.what (  ) << endl;
      		return -1;
!   	}
!   	catch ( Components::InvalidName& e )
    	{
      		cout << "DEPLOYMENT ERROR: invalid name during connection: " << e.what (  ) << endl;
      		return -1;
    	}
!   	catch ( ... )
    	{
      		cout << "DEPLOYMENT ERROR: there is something wrong!" << endl;
      		return -1;
    	}
! 
     	error = undeploy_TestHome("TestHome");
!   	if(error)
    	{
      		cerr << "TEARDOWN ERROR: Can't undeploy component homes!" << endl;
      		return error;
    	}
! 
    	cout << ">>>> Stop Test Client: " << __FILE__ << endl;
  }