[ccmtools-cvs] ccmtools/src/ccmtools/generator/java/templates/jet ExceptionDefDefaultConstructor.jet, 1.3, 1.4 ExceptionDefReasonConstructor.jet, 1.3, 1.4 ComponentDefAssemblyClass.jet, 1.11, 1.12 ExceptionDefConstructor.jet, 1.2, 1.3 ExceptionDefImplementation.jet, 1.5, 1.6

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

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

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

Index: ComponentDefAssemblyClass.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ComponentDefAssemblyClass.jet,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ComponentDefAssemblyClass.jet	21 Mar 2007 12:29:51 -0000	1.11
--- ComponentDefAssemblyClass.jet	12 Apr 2007 15:24:12 -0000	1.12
***************
*** 79,83 ****
  %> 
      	} catch(Exception e) {
!     		throw new Components.CCMException(e.getMessage(), Components.CCMExceptionReason.CREATE_ERROR);
      	}
      }
--- 79,85 ----
  %> 
      	} catch(Exception e) {
!     		throw new Components.CCMException(
!     			"assembly creation failed: "+e.getMessage(),
!     			Components.CCMExceptionReason.CREATE_ERROR, e);
      	}
      }
***************
*** 229,234 ****
  			ccm_activate_ok = true; 
      	} catch(Exception e) {
!     		throw new Components.CCMException(e.getMessage(),
!     			Components.CCMExceptionReason.CREATE_ERROR);
      	}
      }
--- 231,237 ----
  			ccm_activate_ok = true; 
      	} catch(Exception e) {
!     		throw new Components.CCMException(
!     			"assembly configuration failed: "+e.getMessage(),
!     			Components.CCMExceptionReason.CREATE_ERROR, e);
      	}
      }

Index: ExceptionDefConstructor.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ExceptionDefConstructor.jet,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExceptionDefConstructor.jet	27 Jul 2006 14:19:55 -0000	1.2
--- ExceptionDefConstructor.jet	12 Apr 2007 15:24:13 -0000	1.3
***************
*** 6,10 ****
      public <%=exception.getIdentifier()%>(<%=exception.generateConstructorParameterList()%>) 
      {
!         super(REPOSITORY_ID);
  <%
  for(Iterator i=exception.getFields().iterator(); i.hasNext();)
--- 6,10 ----
      public <%=exception.getIdentifier()%>(<%=exception.generateConstructorParameterList()%>) 
      {
!         super();
  <%
  for(Iterator i=exception.getFields().iterator(); i.hasNext();)
***************
*** 18,24 ****
      }
          
!     public <%=exception.getIdentifier()%>(String reason, <%=exception.generateConstructorParameterList()%>)    
      {
!         super(REPOSITORY_ID + " " + reason);
  <%
  for(Iterator i=exception.getFields().iterator(); i.hasNext();)
--- 18,24 ----
      }
          
!     public <%=exception.getIdentifier()%>(String _reason, <%=exception.generateConstructorParameterList()%>)    
      {
!         super(_reason);
  <%
  for(Iterator i=exception.getFields().iterator(); i.hasNext();)

Index: ExceptionDefReasonConstructor.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ExceptionDefReasonConstructor.jet,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ExceptionDefReasonConstructor.jet	27 Jul 2006 14:19:54 -0000	1.3
--- ExceptionDefReasonConstructor.jet	12 Apr 2007 15:24:12 -0000	1.4
***************
*** 4,9 ****
  %>
  <% ExceptionDef exception = (ExceptionDef) argument; %>
!     public <%=exception.getIdentifier()%>(String reason)    
      {
!         super(REPOSITORY_ID + " " + reason);
      }
--- 4,9 ----
  %>
  <% ExceptionDef exception = (ExceptionDef) argument; %>
!     public <%=exception.getIdentifier()%>(String _reason)    
      {
!         super(_reason);
      }

Index: ExceptionDefDefaultConstructor.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ExceptionDefDefaultConstructor.jet,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ExceptionDefDefaultConstructor.jet	27 Jul 2006 14:19:55 -0000	1.3
--- ExceptionDefDefaultConstructor.jet	12 Apr 2007 15:24:12 -0000	1.4
***************
*** 6,10 ****
      public <%=exception.getIdentifier()%>() 
      {
!         super(REPOSITORY_ID);
  <%
  for(Iterator i=exception.getFields().iterator(); i.hasNext();)
--- 6,10 ----
      public <%=exception.getIdentifier()%>() 
      {
!         super();
  <%
  for(Iterator i=exception.getFields().iterator(); i.hasNext();)

Index: ExceptionDefImplementation.jet
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet/ExceptionDefImplementation.jet,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExceptionDefImplementation.jet	10 Jan 2007 16:19:15 -0000	1.5
--- ExceptionDefImplementation.jet	12 Apr 2007 15:24:13 -0000	1.6
***************
*** 17,22 ****
      extends Components.UserException
  {
-     private static final String REPOSITORY_ID = "<%=exception.generateRepositoryId()%>";
-     
  <%
  for(Iterator i=exception.getFields().iterator(); i.hasNext();)
--- 17,20 ----