neuclear-develop — Support requests, cvs etc

[Neuclear-develop] neuclear-ledger-hibernate LICENSE.txt,1.1.1.1,1.2 project.xml,1.3,1.4

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15235

Modified Files:
	LICENSE.txt project.xml 
Log Message:
Actually kind of works now, for checking balance and creating normal transactions and transaction items.

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/LICENSE.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** LICENSE.txt	22 Mar 2004 22:49:16 -0000	1.1.1.1
--- LICENSE.txt	24 Mar 2004 12:33:11 -0000	1.2
***************
*** 56,60 ****
  author's reputation will not be affected by problems that might be
  introduced by others.
! 
    Finally, software patents pose a constant threat to the existence of
  any free program.  We wish to make sure that a company cannot
--- 56,60 ----
  author's reputation will not be affected by problems that might be
  introduced by others.
! 
    Finally, software patents pose a constant threat to the existence of
  any free program.  We wish to make sure that a company cannot
***************
*** 112,116 ****
  former contains code derived from the library, whereas the latter must
  be combined with the library in order to run.
! 
  		  GNU LESSER GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
--- 112,116 ----
  former contains code derived from the library, whereas the latter must
  be combined with the library in order to run.
! 
  		  GNU LESSER GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
***************
*** 159,163 ****
  and you may at your option offer warranty protection in exchange for a
  fee.
! 
    2. You may modify your copy or copies of the Library or any portion
  of it, thus forming a work based on the Library, and copy and
--- 159,163 ----
  and you may at your option offer warranty protection in exchange for a
  fee.
! 
    2. You may modify your copy or copies of the Library or any portion
  of it, thus forming a work based on the Library, and copy and
***************
*** 217,221 ****
  that version instead if you wish.)  Do not make any other change in
  these notices.
! 
    Once this change is made in a given copy, it is irreversible for
  that copy, so the ordinary GNU General Public License applies to all
--- 217,221 ----
  that version instead if you wish.)  Do not make any other change in
  these notices.
! 
    Once this change is made in a given copy, it is irreversible for
  that copy, so the ordinary GNU General Public License applies to all
***************
*** 268,272 ****
  Any executables containing that work also fall under Section 6,
  whether or not they are linked directly with the Library itself.
! 
    6. As an exception to the Sections above, you may also combine or
  link a "work that uses the Library" with the Library to produce a
--- 268,272 ----
  Any executables containing that work also fall under Section 6,
  whether or not they are linked directly with the Library itself.
! 
    6. As an exception to the Sections above, you may also combine or
  link a "work that uses the Library" with the Library to produce a
***************
*** 330,334 ****
  use both them and the Library together in an executable that you
  distribute.
! 
    7. You may place library facilities that are a work based on the
  Library side-by-side in a single library together with other library
--- 330,334 ----
  use both them and the Library together in an executable that you
  distribute.
! 
    7. You may place library facilities that are a work based on the
  Library side-by-side in a single library together with other library
***************
*** 371,375 ****
  You are not responsible for enforcing compliance by third parties with
  this License.
! 
    11. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
--- 371,375 ----
  You are not responsible for enforcing compliance by third parties with
  this License.
! 
    11. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
***************
*** 423,427 ****
  license version number, you may choose any version ever published by
  the Free Software Foundation.
! 
    14. If you wish to incorporate parts of the Library into other free
  programs whose distribution conditions are incompatible with these,
--- 423,427 ----
  license version number, you may choose any version ever published by
  the Free Software Foundation.
! 
    14. If you wish to incorporate parts of the Library into other free
  programs whose distribution conditions are incompatible with these,
***************
*** 457,461 ****
  
  		     END OF TERMS AND CONDITIONS
! 
             How to Apply These Terms to Your New Libraries
  
--- 457,461 ----
  
  		     END OF TERMS AND CONDITIONS
! 
             How to Apply These Terms to Your New Libraries
  

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** project.xml	23 Mar 2004 21:57:50 -0000	1.3
--- project.xml	24 Mar 2004 12:33:11 -0000	1.4
***************
*** 74,78 ****
          <dependency>
              <id>neuclear-commons</id>
!             <version>0.6-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
--- 74,78 ----
          <dependency>
              <id>neuclear-commons</id>
!             <version>0.6</version>
              <properties>
                  <war.bundle>true</war.bundle>

[Neuclear-develop] neuclear-ledger-hibernate/src/java hibernate.properties,1.1,1.2

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-hibernate/src/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15235/src/java

Modified Files:
	hibernate.properties 
Log Message:
Actually kind of works now, for checking balance and creating normal transactions and transaction items.

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/hibernate.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hibernate.properties	23 Mar 2004 21:57:49 -0000	1.1
--- hibernate.properties	24 Mar 2004 12:33:10 -0000	1.2
***************
*** 3,5 ****
  hibernate.connection.url=jdbc:hsqldb:target/test-data/hibernate
  hibernate.connection.driver_class=org.hsqldb.jdbcDriver
! hibernate.dialect=net.sf.hibernate.dialect.HSQLDialect
\ No newline at end of file
--- 3,7 ----
  hibernate.connection.url=jdbc:hsqldb:target/test-data/hibernate
  hibernate.connection.driver_class=org.hsqldb.jdbcDriver
! hibernate.dialect=net.sf.hibernate.dialect.HSQLDialect
! hibernate.show_sql true
! #hibernate.hbm2ddl.auto=create-drop
\ No newline at end of file

[Neuclear-develop] neuclear-ledger-hibernate/src/test/org/neuclear/ledger/hibernate CreateHibernateLedgerTest.java,NONE,1.1

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-hibernate/src/test/org/neuclear/ledger/hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15235/src/test/org/neuclear/ledger/hibernate

Added Files:
	CreateHibernateLedgerTest.java 
Log Message:
Actually kind of works now, for checking balance and creating normal transactions and transaction items.

--- NEW FILE: CreateHibernateLedgerTest.java ---
package org.neuclear.ledger.hibernate;

import junit.framework.TestCase;
import org.neuclear.ledger.*;

/**
 * Created by IntelliJ IDEA.
 * User: pelleb
 * Date: Mar 23, 2004
 * Time: 5:16:42 PM
 * To change this template use File | Settings | File Templates.
 */
public class CreateHibernateLedgerTest extends TestCase {
    public CreateHibernateLedgerTest(String name) {
        super(name);
    }

    public void testCreateLedger() throws UnknownLedgerException, LowlevelLedgerException, UnBalancedTransactionException, InvalidTransactionException {
        Ledger ledger = new HibernateLedger("test", true);
        assertNotNull(ledger);

        double pre = ledger.getBalance("bob");

        PostedTransaction tran = ledger.transfer("bob", "alice", 85, "hello");
        assertNotNull(tran);

        assertEquals(pre - 85, ledger.getBalance("bob"), 0);
//        ledger.close();
    }
}

[Neuclear-develop] neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate HTransaction.hbm.xml,1.1,1.2 HTransaction.java,1.1,1.2 HTransactionItem.hbm.xml,1.1,1.2 HibernateLedger.java,1.3,1.4

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15235/src/java/org/neuclear/ledger/hibernate

Modified Files:
	HTransaction.hbm.xml HTransaction.java 
	HTransactionItem.hbm.xml HibernateLedger.java 
Log Message:
Actually kind of works now, for checking balance and creating normal transactions and transaction items.

Index: HTransaction.hbm.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HTransaction.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HTransaction.hbm.xml	23 Mar 2004 21:57:48 -0000	1.1
--- HTransaction.hbm.xml	24 Mar 2004 12:33:10 -0000	1.2
***************
*** 14,30 ****
              <generator class="assigned"/>
          </id>
!         <property name="requestId">
              <column name="reqid" sql-type="char(32)"
                  not-null="true"/>
          </property>
!         <property name="transactionTime">
!             <column name="transactiontime" sql-type="double"
                  not-null="true"/>
          </property>
!         <property name="comment">
              <column name="comment" sql-type="varchar(256)"
                  not-null="true"/>
          </property>
!         <set name="items" table="transaction_items" inverse="true" cascade="all">
              <key column="transaction_id"/>
              <one-to-many class="org.neuclear.ledger.hibernate.HTransactionItem"/>
--- 14,30 ----
              <generator class="assigned"/>
          </id>
!         <property name="requestId" type="string">
              <column name="reqid" sql-type="char(32)"
                  not-null="true"/>
          </property>
!         <property name="transactionTime" type="timestamp">
!             <column name="transactiontime"
                  not-null="true"/>
          </property>
!         <property name="comment" type="string">
              <column name="comment" sql-type="varchar(256)"
                  not-null="true"/>
          </property>
!         <set name="items" table="transaction_items" cascade="all">
              <key column="transaction_id"/>
              <one-to-many class="org.neuclear.ledger.hibernate.HTransactionItem"/>

Index: HTransactionItem.hbm.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HTransactionItem.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HTransactionItem.hbm.xml	23 Mar 2004 21:57:48 -0000	1.1
--- HTransactionItem.hbm.xml	24 Mar 2004 12:33:10 -0000	1.2
***************
*** 14,23 ****
              <generator class="uuid.hex"/>
          </id>
!         <property name="book">
              <column name="book" sql-type="char(32)"
                  not-null="true"/>
          </property>
!         <property name="amount">
!             <column name="amount" sql-type="double"
                  not-null="true"/>
          </property>
--- 14,23 ----
              <generator class="uuid.hex"/>
          </id>
!         <property name="book" type="string">
              <column name="book" sql-type="char(32)"
                  not-null="true"/>
          </property>
!         <property name="amount" type="double">
!             <column name="amount"
                  not-null="true"/>
          </property>

Index: HibernateLedger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HibernateLedger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HibernateLedger.java	23 Mar 2004 21:57:48 -0000	1.3
--- HibernateLedger.java	24 Mar 2004 12:33:10 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
  
  import net.sf.hibernate.HibernateException;
+ import net.sf.hibernate.Query;
  import net.sf.hibernate.Session;
  import net.sf.hibernate.SessionFactory;
***************
*** 17,20 ****
--- 18,22 ----
  import java.sql.Timestamp;
  import java.util.Date;
+ import java.util.Iterator;
  
  /**
***************
*** 26,30 ****
  public final class HibernateLedger extends Ledger implements LedgerBrowser {
  
!     public HibernateLedger(final String id) throws LowlevelLedgerException, UnknownLedgerException {
          super(id);
  
--- 28,36 ----
  public final class HibernateLedger extends Ledger implements LedgerBrowser {
  
!     public HibernateLedger(final String id) throws UnknownLedgerException, LowlevelLedgerException {
!         this(id, false);
!     }
! 
!     public HibernateLedger(final String id, final boolean create) throws LowlevelLedgerException, UnknownLedgerException {
          super(id);
  
***************
*** 32,39 ****
              Configuration cfg = new Configuration()
                      .addClass(HTransaction.class)
!                     .addClass(HTransactionItem.class)
!                     .addClass(HHeld.class)
!                     .addClass(HHeldItem.class);
! //            new net.sf.hibernate.tool.hbm2ddl.SchemaExport(cfg).create(true, true);
              factory = cfg.buildSessionFactory();
          } catch (HibernateException e) {
--- 38,45 ----
              Configuration cfg = new Configuration()
                      .addClass(HTransaction.class)
!                     .addClass(HTransactionItem.class);
! //                    .addClass(HHeld.class)
! //                    .addClass(HHeldItem.class);
! //            new net.sf.hibernate.tool.hbm2ddl.SchemaExport(cfg).create(create,create);
              factory = cfg.buildSessionFactory();
          } catch (HibernateException e) {
***************
*** 54,61 ****
          try {
              Session ses = factory.openSession();
!             net.sf.hibernate.Transaction t = ses.beginTransaction();
              HTransaction posted = new HTransaction(trans, new Date());
!             ses.saveOrUpdate(posted);
!             t.commit();
              ses.close();
              return posted.createPosted();
--- 60,68 ----
          try {
              Session ses = factory.openSession();
! //            net.sf.hibernate.Transaction t = ses.beginTransaction();
              HTransaction posted = new HTransaction(trans, new Date());
!             ses.save(posted);
!             ses.flush();
! //            t.commit();
              ses.close();
              return posted.createPosted();
***************
*** 99,106 ****
          try {
              Session ses = factory.openSession();
!             net.sf.hibernate.Transaction t = ses.beginTransaction();
              HHeld posted = new HHeld(trans, new Date());
              ses.saveOrUpdate(posted);
!             t.commit();
              ses.close();
              return posted.createPosted();
--- 106,114 ----
          try {
              Session ses = factory.openSession();
! //            net.sf.hibernate.Transaction t = ses.beginTransaction();
              HHeld posted = new HHeld(trans, new Date());
              ses.saveOrUpdate(posted);
! //            t.commit();
!             ses.flush();
              ses.close();
              return posted.createPosted();
***************
*** 174,178 ****
  
      public double getBalance(String book) throws LowlevelLedgerException {
!         return 0;
      }
  
--- 182,201 ----
  
      public double getBalance(String book) throws LowlevelLedgerException {
!         try {
!             Session sess = factory.openSession();
!             Query q = sess.createQuery("select sum(item.amount) from HTransactionItem item where item.book = ?");
!             q.setString(0, book);
!             Iterator cats = q.iterate();
!             if (cats.hasNext()) {
!                 final Object o = cats.next();
!                 if (o != null)
!                     return ((Double) o).doubleValue();
! //                throw new LowlevelLedgerException(this,"Query returned more or less than one column");
!             }
! //            throw new LowlevelLedgerException(this,"Query didnt return a row");
!             return 0;
!         } catch (HibernateException e) {
!             throw new LowlevelLedgerException(e);
!         }
      }
  

[Neuclear-develop] neuclear-ledger-prevalent LICENSE.txt,1.1.1.1,1.2

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-prevalent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15140

Modified Files:
	LICENSE.txt 
Log Message:
Actually kind of works now, for checking balance and creating normal transactions and transaction items.

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-prevalent/LICENSE.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** LICENSE.txt	22 Mar 2004 17:27:10 -0000	1.1.1.1
--- LICENSE.txt	24 Mar 2004 12:32:46 -0000	1.2
***************
*** 56,60 ****
  author's reputation will not be affected by problems that might be
  introduced by others.
! 
    Finally, software patents pose a constant threat to the existence of
  any free program.  We wish to make sure that a company cannot
--- 56,60 ----
  author's reputation will not be affected by problems that might be
  introduced by others.
! 
    Finally, software patents pose a constant threat to the existence of
  any free program.  We wish to make sure that a company cannot
***************
*** 112,116 ****
  former contains code derived from the library, whereas the latter must
  be combined with the library in order to run.
! 
  		  GNU LESSER GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
--- 112,116 ----
  former contains code derived from the library, whereas the latter must
  be combined with the library in order to run.
! 
  		  GNU LESSER GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
***************
*** 159,163 ****
  and you may at your option offer warranty protection in exchange for a
  fee.
! 
    2. You may modify your copy or copies of the Library or any portion
  of it, thus forming a work based on the Library, and copy and
--- 159,163 ----
  and you may at your option offer warranty protection in exchange for a
  fee.
! 
    2. You may modify your copy or copies of the Library or any portion
  of it, thus forming a work based on the Library, and copy and
***************
*** 217,221 ****
  that version instead if you wish.)  Do not make any other change in
  these notices.
! 
    Once this change is made in a given copy, it is irreversible for
  that copy, so the ordinary GNU General Public License applies to all
--- 217,221 ----
  that version instead if you wish.)  Do not make any other change in
  these notices.
! 
    Once this change is made in a given copy, it is irreversible for
  that copy, so the ordinary GNU General Public License applies to all
***************
*** 268,272 ****
  Any executables containing that work also fall under Section 6,
  whether or not they are linked directly with the Library itself.
! 
    6. As an exception to the Sections above, you may also combine or
  link a "work that uses the Library" with the Library to produce a
--- 268,272 ----
  Any executables containing that work also fall under Section 6,
  whether or not they are linked directly with the Library itself.
! 
    6. As an exception to the Sections above, you may also combine or
  link a "work that uses the Library" with the Library to produce a
***************
*** 330,334 ****
  use both them and the Library together in an executable that you
  distribute.
! 
    7. You may place library facilities that are a work based on the
  Library side-by-side in a single library together with other library
--- 330,334 ----
  use both them and the Library together in an executable that you
  distribute.
! 
    7. You may place library facilities that are a work based on the
  Library side-by-side in a single library together with other library
***************
*** 371,375 ****
  You are not responsible for enforcing compliance by third parties with
  this License.
! 
    11. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
--- 371,375 ----
  You are not responsible for enforcing compliance by third parties with
  this License.
! 
    11. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
***************
*** 423,427 ****
  license version number, you may choose any version ever published by
  the Free Software Foundation.
! 
    14. If you wish to incorporate parts of the Library into other free
  programs whose distribution conditions are incompatible with these,
--- 423,427 ----
  license version number, you may choose any version ever published by
  the Free Software Foundation.
! 
    14. If you wish to incorporate parts of the Library into other free
  programs whose distribution conditions are incompatible with these,
***************
*** 457,461 ****
  
  		     END OF TERMS AND CONDITIONS
! 
             How to Apply These Terms to Your New Libraries
  
--- 457,461 ----
  
  		     END OF TERMS AND CONDITIONS
! 
             How to Apply These Terms to Your New Libraries
  

[Neuclear-develop] neuclear-ledger LICENSE.txt,1.1.1.1,1.2

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15094

Modified Files:
	LICENSE.txt 
Log Message:
Actually kind of works now, for checking balance and creating normal transactions and transaction items.

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/LICENSE.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** LICENSE.txt	20 Sep 2003 23:16:17 -0000	1.1.1.1
--- LICENSE.txt	24 Mar 2004 12:32:28 -0000	1.2
***************
*** 56,60 ****
  author's reputation will not be affected by problems that might be
  introduced by others.
! 
    Finally, software patents pose a constant threat to the existence of
  any free program.  We wish to make sure that a company cannot
--- 56,60 ----
  author's reputation will not be affected by problems that might be
  introduced by others.
! 
    Finally, software patents pose a constant threat to the existence of
  any free program.  We wish to make sure that a company cannot
***************
*** 112,116 ****
  former contains code derived from the library, whereas the latter must
  be combined with the library in order to run.
! 
  		  GNU LESSER GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
--- 112,116 ----
  former contains code derived from the library, whereas the latter must
  be combined with the library in order to run.
! 
  		  GNU LESSER GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
***************
*** 159,163 ****
  and you may at your option offer warranty protection in exchange for a
  fee.
! 
    2. You may modify your copy or copies of the Library or any portion
  of it, thus forming a work based on the Library, and copy and
--- 159,163 ----
  and you may at your option offer warranty protection in exchange for a
  fee.
! 
    2. You may modify your copy or copies of the Library or any portion
  of it, thus forming a work based on the Library, and copy and
***************
*** 217,221 ****
  that version instead if you wish.)  Do not make any other change in
  these notices.
! 
    Once this change is made in a given copy, it is irreversible for
  that copy, so the ordinary GNU General Public License applies to all
--- 217,221 ----
  that version instead if you wish.)  Do not make any other change in
  these notices.
! 
    Once this change is made in a given copy, it is irreversible for
  that copy, so the ordinary GNU General Public License applies to all
***************
*** 268,272 ****
  Any executables containing that work also fall under Section 6,
  whether or not they are linked directly with the Library itself.
! 
    6. As an exception to the Sections above, you may also combine or
  link a "work that uses the Library" with the Library to produce a
--- 268,272 ----
  Any executables containing that work also fall under Section 6,
  whether or not they are linked directly with the Library itself.
! 
    6. As an exception to the Sections above, you may also combine or
  link a "work that uses the Library" with the Library to produce a
***************
*** 330,334 ****
  use both them and the Library together in an executable that you
  distribute.
! 
    7. You may place library facilities that are a work based on the
  Library side-by-side in a single library together with other library
--- 330,334 ----
  use both them and the Library together in an executable that you
  distribute.
! 
    7. You may place library facilities that are a work based on the
  Library side-by-side in a single library together with other library
***************
*** 371,375 ****
  You are not responsible for enforcing compliance by third parties with
  this License.
! 
    11. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
--- 371,375 ----
  You are not responsible for enforcing compliance by third parties with
  this License.
! 
    11. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
***************
*** 423,427 ****
  license version number, you may choose any version ever published by
  the Free Software Foundation.
! 
    14. If you wish to incorporate parts of the Library into other free
  programs whose distribution conditions are incompatible with these,
--- 423,427 ----
  license version number, you may choose any version ever published by
  the Free Software Foundation.
! 
    14. If you wish to incorporate parts of the Library into other free
  programs whose distribution conditions are incompatible with these,
***************
*** 457,461 ****
  
  		     END OF TERMS AND CONDITIONS
! 
             How to Apply These Terms to Your New Libraries
  
--- 457,461 ----
  
  		     END OF TERMS AND CONDITIONS
! 
             How to Apply These Terms to Your New Libraries
  

[Neuclear-develop] neuclear-id project.properties,1.32,1.33 project.xml,1.29,1.30

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14825

Modified Files:
	project.properties project.xml 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/project.properties,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** project.properties	19 Feb 2004 15:30:22 -0000	1.32
--- project.properties	23 Mar 2004 22:03:17 -0000	1.33
***************
*** 17,21 ****
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/
  
  maven.javaapp.mainclass = org.neuclear.id.tools.commandline.IdentityCreator
--- 17,21 ----
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://old.neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/
  
  maven.javaapp.mainclass = org.neuclear.id.tools.commandline.IdentityCreator
***************
*** 25,28 ****
  maven.jar.index = true
  maven.uberjar.main = org.neuclear.id.tools.commandline.IdentityCreator
! maven.repo.central = neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven
--- 25,28 ----
  maven.jar.index = true
  maven.uberjar.main = org.neuclear.id.tools.commandline.IdentityCreator
! maven.repo.central = old.neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** project.xml	13 Jan 2004 23:38:26 -0000	1.29
--- project.xml	23 Mar 2004 22:03:17 -0000	1.30
***************
*** 19,23 ****
      </description>
  
!     <url>http://neuclear.org/id/</url>
      <repository>
          <connection>
--- 19,23 ----
      </description>
  
!     <url>http://old.neuclear.org/id/</url>
      <repository>
          <connection>
***************
*** 29,35 ****
      </repository>
  
!     <siteAddress>neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/id/</siteDirectory>
!     <issueTrackingUrl>http://jira.neuclear.org:8080/</issueTrackingUrl>
      <mailingLists>
          <mailingList>
--- 29,35 ----
      </repository>
  
!     <siteAddress>old.neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/id/</siteDirectory>
!     <issueTrackingUrl>http://jira.neuclear.org/</issueTrackingUrl>
      <mailingLists>
          <mailingList>
***************
*** 71,75 ****
              <id>neuclear-xmlsig</id>
              <name>neuclear-xmlsig</name>
!             <version>0.12-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
--- 71,75 ----
              <id>neuclear-xmlsig</id>
              <name>neuclear-xmlsig</name>
!             <version>0.12</version>
              <properties>
                  <war.bundle>true</war.bundle>
***************
*** 80,84 ****
              <id>neuclear-commons</id>
              <name>neuclear-commons</name>
!             <version>0.6-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
--- 80,84 ----
              <id>neuclear-commons</id>
              <name>neuclear-commons</name>
!             <version>0.6</version>
              <properties>
                  <war.bundle>true</war.bundle>

[Neuclear-develop] neuclear-xmlsig/xdocs index.xml,1.5,1.6

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14719/xdocs

Modified Files:
	index.xml 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: index.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/xdocs/index.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** index.xml	23 Mar 2004 20:51:01 -0000	1.5
--- index.xml	23 Mar 2004 22:02:55 -0000	1.6
***************
*** 20,24 ****
              </ul>
              <p>
!                 <a href="http://jira.neuclear.org/secure/ReleaseNote.jspa?projectId=10020&styleName=Html&version=10051">See full list.</a>
              </p>
              <p>
--- 20,24 ----
              </ul>
              <p>
!                 <a href="http://jira.neuclear.org/secure/ReleaseNote.jspa?projectId=10020&amp;styleName=Html&amp;version=10051">See full list.</a>
              </p>
              <p>

[Neuclear-develop] neuclear-commons/xdocs index.xml,1.4,1.5

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-commons/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14649/xdocs

Modified Files:
	index.xml 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: index.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/xdocs/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.xml	23 Mar 2004 19:23:40 -0000	1.4
--- index.xml	23 Mar 2004 22:02:39 -0000	1.5
***************
*** 23,27 ****
              <p>
                  Main goal of this release is to support the coming
!                 <a href="http://neuclear.org/id/">0.9 release
                  of NeuClear ID</a>.
                  <a href="http://sourceforge.net/project/showfiles.php?group_id=90470">Download it today and join in the NeuClear revolution</a>.
--- 23,27 ----
              <p>
                  Main goal of this release is to support the coming
!                 <a href="http://old.neuclear.org/id/">0.9 release
                  of NeuClear ID</a>.
                  <a href="http://sourceforge.net/project/showfiles.php?group_id=90470">Download it today and join in the NeuClear revolution</a>.
***************
*** 42,46 ****
              <p>
                  Main goal of this release is to support the latest
!                 <a href="http://neuclear.org/id/">0.8 release
                  of NeuClear ID</a>.
                  <a href="http://sourceforge.net/project/showfiles.php?group_id=90470">Download it today and join in the NeuClear revolution</a>.
--- 42,46 ----
              <p>
                  Main goal of this release is to support the latest
!                 <a href="http://old.neuclear.org/id/">0.8 release
                  of NeuClear ID</a>.
                  <a href="http://sourceforge.net/project/showfiles.php?group_id=90470">Download it today and join in the NeuClear revolution</a>.
***************
*** 52,58 ****
                  This release is very quick after 0.3, but we deemed it necessary
                  to move a bunch of crypto code from
!                 <a href="http://neuclear.org/id/">NeuClear ID</a>
                  and
!                 <a href="http://neuclear.org/xmlsig/">NeuClear XMLSig</a> to here.
                  If you are using any of the CVS modules as well as the latest release 0.10 of
                  XMLSig please update to this release.
--- 52,58 ----
                  This release is very quick after 0.3, but we deemed it necessary
                  to move a bunch of crypto code from
!                 <a href="http://old.neuclear.org/id/">NeuClear ID</a>
                  and
!                 <a href="http://old.neuclear.org/xmlsig/">NeuClear XMLSig</a> to here.
                  If you are using any of the CVS modules as well as the latest release 0.10 of
                  XMLSig please update to this release.

[Neuclear-develop] neuclear-ledger-prevalent project.properties,1.2,1.3 project.xml,1.3,1.4

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-prevalent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14575

Modified Files:
	project.properties project.xml 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-prevalent/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** project.properties	22 Mar 2004 20:08:46 -0000	1.2
--- project.properties	23 Mar 2004 22:02:23 -0000	1.3
***************
*** 19,23 ****
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/
! maven.repo.central = neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven
--- 19,23 ----
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://old.neuclear.org/maven/
! maven.repo.central = old.neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-prevalent/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** project.xml	22 Mar 2004 23:20:58 -0000	1.3
--- project.xml	23 Mar 2004 22:02:23 -0000	1.4
***************
*** 17,21 ****
      </description>
  
!     <url>http://neuclear.org/ledger/prevalent/</url>
  
      <repository>
--- 17,21 ----
      </description>
  
!     <url>http://old.neuclear.org/ledger/prevalent/</url>
  
      <repository>
***************
*** 67,71 ****
          <dependency>
              <id>neuclear-commons</id>
!             <version>0.6-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
--- 67,71 ----
          <dependency>
              <id>neuclear-commons</id>
!             <version>0.6</version>
              <properties>
                  <war.bundle>true</war.bundle>

[Neuclear-develop] neuclear-pay project.properties,1.6,1.7 project.xml,1.21,1.22

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-pay
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14521

Modified Files:
	project.properties project.xml 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** project.properties	22 Nov 2003 00:22:29 -0000	1.6
--- project.properties	23 Mar 2004 22:02:06 -0000	1.7
***************
*** 17,22 ****
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/
  maven.test.skip=true
! maven.repo.central = neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven
--- 17,22 ----
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://old.neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/
  maven.test.skip=true
! maven.repo.central = old.neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** project.xml	18 Jan 2004 21:20:12 -0000	1.21
--- project.xml	23 Mar 2004 22:02:06 -0000	1.22
***************
*** 19,23 ****
      </description>
  
!     <url>http://neuclear.org/pay/</url>
      <repository>
          <connection>
--- 19,23 ----
      </description>
  
!     <url>http://old.neuclear.org/pay/</url>
      <repository>
          <connection>
***************
*** 29,35 ****
      </repository>
  
!     <siteAddress>neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/pay/</siteDirectory>
!     <issueTrackingUrl>http://devone.veraxpay.com:9090/</issueTrackingUrl>
      <mailingLists>
          <mailingList>
--- 29,35 ----
      </repository>
  
!     <siteAddress>old.neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/pay/</siteDirectory>
!     <issueTrackingUrl>http://jira.neuclear.org/</issueTrackingUrl>
      <mailingLists>
          <mailingList>
***************
*** 74,78 ****
              <id>neuclear-commons</id>
              <name>neuclear-commons</name>
!             <version>0.6-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
--- 74,78 ----
              <id>neuclear-commons</id>
              <name>neuclear-commons</name>
!             <version>0.6</version>
              <properties>
                  <war.bundle>true</war.bundle>
***************
*** 97,101 ****
              <id>neuclear-xmlsig</id>
              <name>neuclear-xmlsig</name>
!             <version>0.12-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
--- 97,101 ----
              <id>neuclear-xmlsig</id>
              <name>neuclear-xmlsig</name>
!             <version>0.12</version>
              <properties>
                  <war.bundle>true</war.bundle>

[Neuclear-develop] neuclear-ledger/src/java/org/neuclear/ledger Ledger.java,1.12,1.13 PostedTransaction.java,1.6,1.7 Transaction.java,1.5,1.6

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14384/src/java/org/neuclear/ledger

Modified Files:
	Ledger.java PostedTransaction.java Transaction.java 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: Ledger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/Ledger.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Ledger.java	22 Mar 2004 21:59:37 -0000	1.12
--- Ledger.java	23 Mar 2004 22:01:43 -0000	1.13
***************
*** 4,7 ****
--- 4,12 ----
   * $Id$
   * $Log$
+  * Revision 1.13  2004/03/23 22:01:43  pelle
+  * Bumped version numbers for commons and xmlsig througout.
+  * Updated repositories and webservers to use old.neuclear.org
+  * Various other fixes in project.xml and project.properties on misc projects.
+  *
   * Revision 1.12  2004/03/22 21:59:37  pelle
   * SimpleLedger now passes all unit tests
***************
*** 306,309 ****
  
  
!     public abstract void close();
  }
--- 311,314 ----
  
  
!     public abstract void close() throws LowlevelLedgerException;
  }

Index: PostedTransaction.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/PostedTransaction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PostedTransaction.java	21 Mar 2004 00:48:36 -0000	1.6
--- PostedTransaction.java	23 Mar 2004 22:01:43 -0000	1.7
***************
*** 8,11 ****
--- 8,16 ----
   * $Id$
   * $Log$
+  * Revision 1.7  2004/03/23 22:01:43  pelle
+  * Bumped version numbers for commons and xmlsig througout.
+  * Updated repositories and webservers to use old.neuclear.org
+  * Various other fixes in project.xml and project.properties on misc projects.
+  *
   * Revision 1.6  2004/03/21 00:48:36  pelle
   * The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.

Index: Transaction.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/Transaction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Transaction.java	21 Mar 2004 00:48:36 -0000	1.5
--- Transaction.java	23 Mar 2004 22:01:43 -0000	1.6
***************
*** 4,7 ****
--- 4,12 ----
   * $Id$
   * $Log$
+  * Revision 1.6  2004/03/23 22:01:43  pelle
+  * Bumped version numbers for commons and xmlsig througout.
+  * Updated repositories and webservers to use old.neuclear.org
+  * Various other fixes in project.xml and project.properties on misc projects.
+  *
   * Revision 1.5  2004/03/21 00:48:36  pelle
   * The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
***************
*** 64,68 ****
   */
  public abstract class Transaction implements Serializable {
- 
      protected Transaction(final String req, final String id, final String comment, List items) throws InvalidTransactionException {
          this.comment = comment;
--- 69,72 ----
***************
*** 89,93 ****
      }
  
!     final List getItemList() {
          return new ArrayList(items);
      }
--- 93,97 ----
      }
  
!     public final List getItemList() {
          return new ArrayList(items);
      }

[Neuclear-develop] neuclear-ledger project.properties,1.7,1.8 project.xml,1.15,1.16

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14384

Modified Files:
	project.properties project.xml 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/project.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** project.properties	22 Mar 2004 23:20:51 -0000	1.7
--- project.properties	23 Mar 2004 22:01:43 -0000	1.8
***************
*** 19,23 ****
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/
! maven.repo.central = neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven
--- 19,23 ----
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://old.neuclear.org/maven/
! maven.repo.central = old.neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** project.xml	18 Jan 2004 21:20:07 -0000	1.15
--- project.xml	23 Mar 2004 22:01:43 -0000	1.16
***************
*** 1,89 ****
  <?xml version="1.0"?>
  <project>
!   <name>NeuClear Ledger</name>
!   <id>neuclear-ledger</id>
!   <currentVersion>0.4-SNAPSHOT</currentVersion>
!   <inceptionYear>2003</inceptionYear>
!   <package>org.neuclear.ledger</package>
!   <logo>/images/logo.gif</logo>
!   <shortDescription>NeuClear Ledger API</shortDescription>
! 	<organization>
! 		<name>Antilles Software Ventures SA</name>
! 		<url>http://neubia.com/</url>
  
! <!--	  <logo>/images/neubiasmallnotext.png</logo>-->
! 	</organization>
!   <description>
      Generalised Java API for Ledger like Applications.
!   </description>
  
!   <url>http://neuclear.org/ledger/</url>
  
      <repository>
!      <connection>
           scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger
!      </connection>
!      <url>
        http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-ledger/
!     </url>
!   </repository>
  
!   <siteAddress>neuclear.org</siteAddress>
!   <siteDirectory>/home/sites/neuclear.org/public_html/ledger/</siteDirectory>
!   <issueTrackingUrl>http://devone.veraxpay.com:9090</issueTrackingUrl>
!   <mailingLists>
!     <mailingList>
!       <name>NeuDist Announce</name>
!       <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe>
!       <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-announce</archive>
!     </mailingList>
!     <mailingList>
!       <name>NeuDist Discuss</name>
!       <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-discuss</subscribe>
!       <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-discuss</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-discuss</archive>
!     </mailingList>
!   </mailingLists>
  
!   <developers>
  
!      <developer>
!       <name>Pelle Braendgaard</name>
!       <id>pelle</id>
!       <email>pe...@ne...</email>
!       <organization>Antilles Software Ventures SA</organization>
!     </developer>
  
!   </developers>
  
  
!   <!-- Need to mark these as compile-time/run-time -->
!    <dependencies>
!        <dependency>
!            <id>hsqldb</id>
!            <version>1.7.1</version>
              <properties>
                  <war.bundle>true</war.bundle>
              </properties>
!        </dependency>
!        <dependency>
!            <id>neuclear-id</id>
!            <version>0.9-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
!             </properties>       </dependency>
!        <dependency>
!            <id>picocontainer</id>
!            <version>1.0-beta-1</version>
!        </dependency>
!        <dependency>
!            <id>neuclear-commons</id>
!            <version>0.6-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
              </properties>
!        </dependency>
!    <dependency>
              <id>dom4j</id>
              <version>1.4</version>
--- 1,90 ----
  <?xml version="1.0"?>
  <project>
!     <name>NeuClear Ledger</name>
!     <id>neuclear-ledger</id>
!     <currentVersion>0.4-SNAPSHOT</currentVersion>
!     <inceptionYear>2003</inceptionYear>
!     <package>org.neuclear.ledger</package>
!     <logo>/images/logo.gif</logo>
!     <shortDescription>NeuClear Ledger API</shortDescription>
!     <organization>
!         <name>Antilles Software Ventures SA</name>
!         <url>http://neubia.com/</url>
  
!         <!--	  <logo>/images/neubiasmallnotext.png</logo>-->
!     </organization>
!     <description>
      Generalised Java API for Ledger like Applications.
!     </description>
  
!     <url>http://old.neuclear.org/ledger/</url>
  
      <repository>
!         <connection>
           scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger
!         </connection>
!         <url>
        http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-ledger/
!         </url>
!     </repository>
  
!     <siteAddress>old.neuclear.org</siteAddress>
!     <siteDirectory>/home/sites/neuclear.org/public_html/ledger/</siteDirectory>
!     <issueTrackingUrl>http://jira.neuclear.org</issueTrackingUrl>
!     <mailingLists>
!         <mailingList>
!             <name>NeuClear Announce</name>
!             <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe>
!             <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe>
!             <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-announce</archive>
!         </mailingList>
!         <mailingList>
!             <name>NeuClear Discuss</name>
!             <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-discuss</subscribe>
!             <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-discuss</unsubscribe>
!             <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-discuss</archive>
!         </mailingList>
!     </mailingLists>
  
!     <developers>
  
!         <developer>
!             <name>Pelle Braendgaard</name>
!             <id>pelle</id>
!             <email>pe...@ne...</email>
!             <organization>Antilles Software Ventures SA</organization>
!         </developer>
  
!     </developers>
  
  
!     <!-- Need to mark these as compile-time/run-time -->
!     <dependencies>
!         <dependency>
!             <id>hsqldb</id>
!             <version>1.7.1</version>
              <properties>
                  <war.bundle>true</war.bundle>
              </properties>
!         </dependency>
!         <dependency>
!             <id>neuclear-id</id>
!             <version>0.9-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
!             </properties>
!         </dependency>
!         <dependency>
!             <id>picocontainer</id>
!             <version>1.0-beta-1</version>
!         </dependency>
!         <dependency>
!             <id>neuclear-commons</id>
!             <version>0.6</version>
              <properties>
                  <war.bundle>true</war.bundle>
              </properties>
!         </dependency>
!         <dependency>
              <id>dom4j</id>
              <version>1.4</version>
***************
*** 102,114 ****
              </properties>
          </dependency>
!        <dependency>
!            <id>servletapi</id>
!            <version>2.3</version>
!        </dependency>
!    <dependency>
!       <id>junit</id>
!       <name>junit</name>
!       <version>3.8.1</version>
!     </dependency>
          <dependency>
              <id>carol</id>
--- 103,115 ----
              </properties>
          </dependency>
!         <dependency>
!             <id>servletapi</id>
!             <version>2.3</version>
!         </dependency>
!         <dependency>
!             <id>junit</id>
!             <name>junit</name>
!             <version>3.8.1</version>
!         </dependency>
          <dependency>
              <id>carol</id>
***************
*** 126,137 ****
              </properties>
          </dependency>
! <!--        <dependency>
!             <groupId>jotm</groupId>
!             <artifactId>jotm_jrmp_stubs</artifactId>
!             <version>1.4.3</version>
!             <properties>
!                 <war.bundle>true</war.bundle>
!             </properties>
!         </dependency>-->
          <dependency>
              <id>xapool</id>
--- 127,138 ----
              </properties>
          </dependency>
!         <!--        <dependency>
!                     <groupId>jotm</groupId>
!                     <artifactId>jotm_jrmp_stubs</artifactId>
!                     <version>1.4.3</version>
!                     <properties>
!                         <war.bundle>true</war.bundle>
!                     </properties>
!                 </dependency>-->
          <dependency>
              <id>xapool</id>
***************
*** 148,190 ****
              </properties>
          </dependency>
!        <dependency>
!            <id>commons-logging</id>
!            <version>1.0.3</version>
!        </dependency>
  
!   </dependencies>
!   <build>
  
! <!--    <sourceDirectories>-->
!       <sourceDirectory>src/java</sourceDirectory>
! <!--    </sourceDirectories>-->
  
!     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
!     <integrationUnitTestSourceDirectory/>
  
!     <aspectSourceDirectory/>
  
!     <!-- Unit test cases -->
!     <unitTest>
!       <includes>
!         <include>**/*Test.java</include>
!       </includes>
!       <excludes>
!         <exclude>**/LedgerTest.java</exclude>
!       </excludes>
!     </unitTest>
  
!       <resources>
!           <resource>
!               <directory>
                    src/java
!               </directory>
!               <includes>*.jks</includes>
!               <includes>*.xml</includes>
!   <!--            <targetPath>org/neuclear/commons/crypto/signers</targetPath>-->
!           </resource>
!       </resources>
  
!   </build>
  </project>
  
--- 149,191 ----
              </properties>
          </dependency>
!         <dependency>
!             <id>commons-logging</id>
!             <version>1.0.3</version>
!         </dependency>
  
!     </dependencies>
!     <build>
  
!         <!--    <sourceDirectories>-->
!         <sourceDirectory>src/java</sourceDirectory>
!         <!--    </sourceDirectories>-->
  
!         <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
!         <integrationUnitTestSourceDirectory/>
  
!         <aspectSourceDirectory/>
  
!         <!-- Unit test cases -->
!         <unitTest>
!             <includes>
!                 <include>**/*Test.java</include>
!             </includes>
!             <excludes>
!                 <exclude>**/LedgerTest.java</exclude>
!             </excludes>
!         </unitTest>
  
!         <resources>
!             <resource>
!                 <directory>
                    src/java
!                 </directory>
!                 <includes>*.jks</includes>
!                 <includes>*.xml</includes>
!                 <!--            <targetPath>org/neuclear/commons/crypto/signers</targetPath>-->
!             </resource>
!         </resources>
  
!     </build>
  </project>
  

[Neuclear-develop] neuclear-ledger/src/java/org/neuclear/ledger/browser LedgerConfiguration.java,1.2,1.3

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/browser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14384/src/java/org/neuclear/ledger/browser

Modified Files:
	LedgerConfiguration.java 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: LedgerConfiguration.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/browser/LedgerConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LedgerConfiguration.java	21 Mar 2004 00:48:35 -0000	1.2
--- LedgerConfiguration.java	23 Mar 2004 22:01:42 -0000	1.3
***************
*** 2,9 ****
  
  import org.neuclear.commons.configuration.Configuration;
! import org.neuclear.commons.sql.ConnectionSource;
! import org.neuclear.commons.sql.TestCaseXAConnectionSource;
! import org.neuclear.commons.sql.statements.SimpleStatementFactory;
! import org.neuclear.commons.sql.statements.StatementFactory;
  
  /*
--- 2,9 ----
  
  import org.neuclear.commons.configuration.Configuration;
! import org.neuclear.ledger.Ledger;
! import org.neuclear.ledger.simple.SimpleLedger;
! import org.picocontainer.Parameter;
! import org.picocontainer.defaults.ConstantParameter;
  
  /*
***************
*** 27,30 ****
--- 27,35 ----
  $Id$
  $Log$
+ Revision 1.3  2004/03/23 22:01:42  pelle
+ Bumped version numbers for commons and xmlsig througout.
+ Updated repositories and webservers to use old.neuclear.org
+ Various other fixes in project.xml and project.properties on misc projects.
+ 
  Revision 1.2  2004/03/21 00:48:35  pelle
  The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
***************
*** 42,48 ****
  public class LedgerConfiguration implements Configuration {
      public void configure(org.picocontainer.MutablePicoContainer pico) {
!         pico.registerComponentImplementation(ConnectionSource.class, TestCaseXAConnectionSource.class);
!         pico.registerComponentImplementation(StatementFactory.class, SimpleStatementFactory.class);
  //        pico.registerComponentImplementation(Ledger.class,SQLLedger.class,new Parameter[] {new ConstantParameter("neu://test/bux")});
  
      }
--- 47,54 ----
  public class LedgerConfiguration implements Configuration {
      public void configure(org.picocontainer.MutablePicoContainer pico) {
! //        pico.registerComponentImplementation(ConnectionSource.class, TestCaseXAConnectionSource.class);
! //        pico.registerComponentImplementation(StatementFactory.class, SimpleStatementFactory.class);
  //        pico.registerComponentImplementation(Ledger.class,SQLLedger.class,new Parameter[] {new ConstantParameter("neu://test/bux")});
+         pico.registerComponentImplementation(Ledger.class, SimpleLedger.class, new Parameter[]{new ConstantParameter("neu://test/bux")});
  
      }

[Neuclear-develop] neuclear-ledger-sql project.properties,1.1.1.1,1.2 project.xml,1.1.1.1,1.2

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14187

Modified Files:
	project.properties project.xml 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-sql/project.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** project.properties	22 Mar 2004 19:49:51 -0000	1.1.1.1
--- project.properties	23 Mar 2004 22:01:23 -0000	1.2
***************
*** 19,23 ****
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/
! maven.repo.central = neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven
--- 19,23 ----
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://old.neuclear.org/maven/
! maven.repo.central = old.neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-sql/project.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** project.xml	22 Mar 2004 19:49:50 -0000	1.1.1.1
--- project.xml	23 Mar 2004 22:01:23 -0000	1.2
***************
*** 1,93 ****
  <?xml version="1.0"?>
  <project>
!   <name>NeuClear Ledger</name>
!   <id>neuclear-ledger-sql</id>
!   <currentVersion>0.4-SNAPSHOT</currentVersion>
!   <inceptionYear>2003</inceptionYear>
!   <package>org.neuclear.ledger.sql</package>
!   <logo>/images/logo.gif</logo>
!   <shortDescription>NeuClear Ledger sql Implementation</shortDescription>
! 	<organization>
! 		<name>Antilles Software Ventures SA</name>
! 		<url>http://neubia.com/</url>
  
! 	</organization>
!   <description>
      Generalised Java API for Ledger like Applications.
!   </description>
  
!   <url>http://neuclear.org/ledger/</url>
  
      <repository>
!      <connection>
           scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger
!      </connection>
!      <url>
        http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-ledger/
!     </url>
!   </repository>
  
!   <siteAddress>neuclear.org</siteAddress>
!   <siteDirectory>/home/sites/neuclear.org/public_html/ledger/</siteDirectory>
!   <issueTrackingUrl>http://devone.veraxpay.com:9090</issueTrackingUrl>
!   <mailingLists>
!     <mailingList>
!       <name>NeuDist Announce</name>
!       <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe>
!       <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-announce</archive>
!     </mailingList>
!     <mailingList>
!       <name>NeuDist Discuss</name>
!       <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-discuss</subscribe>
!       <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-discuss</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-discuss</archive>
!     </mailingList>
!   </mailingLists>
  
!   <developers>
  
!      <developer>
!       <name>Pelle Braendgaard</name>
!       <id>pelle</id>
!       <email>pe...@ne...</email>
!       <organization>Antilles Software Ventures SA</organization>
!     </developer>
  
!   </developers>
  
  
!   <!-- Need to mark these as compile-time/run-time -->
!    <dependencies>
! 	<dependency>
! 	<id>neuclear-ledger</id>
! 	<version>0.4-SNAPSHOT</version>
! 	</dependency>
! 	
!        <dependency>
!            <id>hsqldb</id>
!            <version>1.7.1</version>
              <properties>
                  <war.bundle>true</war.bundle>
              </properties>
!        </dependency>
!        <dependency>
!            <id>neuclear-id</id>
!            <version>0.9-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
!             </properties>       </dependency>
!        <dependency>
!            <id>picocontainer</id>
!            <version>1.0-beta-1</version>
!        </dependency>
!        <dependency>
!            <id>neuclear-commons</id>
!            <version>0.6-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
              </properties>
!        </dependency>
!    <dependency>
              <id>dom4j</id>
              <version>1.4</version>
--- 1,94 ----
  <?xml version="1.0"?>
  <project>
!     <name>NeuClear Ledger</name>
!     <id>neuclear-ledger-sql</id>
!     <currentVersion>0.4-SNAPSHOT</currentVersion>
!     <inceptionYear>2003</inceptionYear>
!     <package>org.neuclear.ledger.sql</package>
!     <logo>/images/logo.gif</logo>
!     <shortDescription>NeuClear Ledger sql Implementation</shortDescription>
!     <organization>
!         <name>Antilles Software Ventures SA</name>
!         <url>http://neubia.com/</url>
  
!     </organization>
!     <description>
      Generalised Java API for Ledger like Applications.
!     </description>
  
!     <url>http://neuclear.org/ledger/</url>
  
      <repository>
!         <connection>
           scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger
!         </connection>
!         <url>
        http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-ledger/
!         </url>
!     </repository>
  
!     <siteAddress>neuclear.org</siteAddress>
!     <siteDirectory>/home/sites/neuclear.org/public_html/ledger/</siteDirectory>
!     <issueTrackingUrl>http://devone.veraxpay.com:9090</issueTrackingUrl>
!     <mailingLists>
!         <mailingList>
!             <name>NeuDist Announce</name>
!             <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe>
!             <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe>
!             <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-announce</archive>
!         </mailingList>
!         <mailingList>
!             <name>NeuDist Discuss</name>
!             <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-discuss</subscribe>
!             <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-discuss</unsubscribe>
!             <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-discuss</archive>
!         </mailingList>
!     </mailingLists>
  
!     <developers>
  
!         <developer>
!             <name>Pelle Braendgaard</name>
!             <id>pelle</id>
!             <email>pe...@ne...</email>
!             <organization>Antilles Software Ventures SA</organization>
!         </developer>
  
!     </developers>
  
  
!     <!-- Need to mark these as compile-time/run-time -->
!     <dependencies>
!         <dependency>
!             <id>neuclear-ledger</id>
!             <version>0.4-SNAPSHOT</version>
!         </dependency>
! 
!         <dependency>
!             <id>hsqldb</id>
!             <version>1.7.1</version>
              <properties>
                  <war.bundle>true</war.bundle>
              </properties>
!         </dependency>
!         <dependency>
!             <id>neuclear-id</id>
!             <version>0.9-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
!             </properties>
!         </dependency>
!         <dependency>
!             <id>picocontainer</id>
!             <version>1.0-beta-1</version>
!         </dependency>
!         <dependency>
!             <id>neuclear-commons</id>
!             <version>0.6</version>
              <properties>
                  <war.bundle>true</war.bundle>
              </properties>
!         </dependency>
!         <dependency>
              <id>dom4j</id>
              <version>1.4</version>
***************
*** 106,118 ****
              </properties>
          </dependency>
!        <dependency>
!            <id>servletapi</id>
!            <version>2.3</version>
!        </dependency>
!    <dependency>
!       <id>junit</id>
!       <name>junit</name>
!       <version>3.8.1</version>
!     </dependency>
          <dependency>
              <id>carol</id>
--- 107,119 ----
              </properties>
          </dependency>
!         <dependency>
!             <id>servletapi</id>
!             <version>2.3</version>
!         </dependency>
!         <dependency>
!             <id>junit</id>
!             <name>junit</name>
!             <version>3.8.1</version>
!         </dependency>
          <dependency>
              <id>carol</id>
***************
*** 130,141 ****
              </properties>
          </dependency>
! <!--        <dependency>
!             <groupId>jotm</groupId>
!             <artifactId>jotm_jrmp_stubs</artifactId>
!             <version>1.4.3</version>
!             <properties>
!                 <war.bundle>true</war.bundle>
!             </properties>
!         </dependency>-->
          <dependency>
              <id>xapool</id>
--- 131,142 ----
              </properties>
          </dependency>
!         <!--        <dependency>
!                     <groupId>jotm</groupId>
!                     <artifactId>jotm_jrmp_stubs</artifactId>
!                     <version>1.4.3</version>
!                     <properties>
!                         <war.bundle>true</war.bundle>
!                     </properties>
!                 </dependency>-->
          <dependency>
              <id>xapool</id>
***************
*** 152,194 ****
              </properties>
          </dependency>
!        <dependency>
!            <id>commons-logging</id>
!            <version>1.0.3</version>
!        </dependency>
  
!   </dependencies>
!   <build>
  
! <!--    <sourceDirectories>-->
!       <sourceDirectory>src/java</sourceDirectory>
! <!--    </sourceDirectories>-->
  
!     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
!     <integrationUnitTestSourceDirectory/>
  
!     <aspectSourceDirectory/>
  
!     <!-- Unit test cases -->
!     <unitTest>
!       <includes>
!         <include>**/*Test.java</include>
!       </includes>
!       <excludes>
!         <exclude>**/LedgerTest.java</exclude>
!       </excludes>
!     </unitTest>
  
!       <resources>
!           <resource>
!               <directory>
                    src/java
!               </directory>
!               <includes>*.jks</includes>
!               <includes>*.xml</includes>
!   <!--            <targetPath>org/neuclear/commons/crypto/signers</targetPath>-->
!           </resource>
!       </resources>
  
!   </build>
  </project>
  
--- 153,195 ----
              </properties>
          </dependency>
!         <dependency>
!             <id>commons-logging</id>
!             <version>1.0.3</version>
!         </dependency>
  
!     </dependencies>
!     <build>
  
!         <!--    <sourceDirectories>-->
!         <sourceDirectory>src/java</sourceDirectory>
!         <!--    </sourceDirectories>-->
  
!         <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
!         <integrationUnitTestSourceDirectory/>
  
!         <aspectSourceDirectory/>
  
!         <!-- Unit test cases -->
!         <unitTest>
!             <includes>
!                 <include>**/*Test.java</include>
!             </includes>
!             <excludes>
!                 <exclude>**/LedgerTest.java</exclude>
!             </excludes>
!         </unitTest>
  
!         <resources>
!             <resource>
!                 <directory>
                    src/java
!                 </directory>
!                 <includes>*.jks</includes>
!                 <includes>*.xml</includes>
!                 <!--            <targetPath>org/neuclear/commons/crypto/signers</targetPath>-->
!             </resource>
!         </resources>
  
!     </build>
  </project>
  

[Neuclear-develop] neuclear-ledger-sql/src/java/org/neuclear/ledger/sql SQLLedger.java,1.1,1.2

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-sql/src/java/org/neuclear/ledger/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14187/src/java/org/neuclear/ledger/sql

Modified Files:
	SQLLedger.java 
Log Message:
Bumped version numbers for commons and xmlsig througout.
Updated repositories and webservers to use old.neuclear.org
Various other fixes in project.xml and project.properties on misc projects.

Index: SQLLedger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-sql/src/java/org/neuclear/ledger/sql/SQLLedger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SQLLedger.java	22 Mar 2004 20:08:09 -0000	1.1
--- SQLLedger.java	23 Mar 2004 22:01:22 -0000	1.2
***************
*** 49,53 ****
  */
      public SQLLedger(final StatementFactory fact, final String id) throws LowlevelLedgerException, UnknownLedgerException {
!         super(id, "sql ledger");
          this.fact = fact;
          create(fact);
--- 49,53 ----
  */
      public SQLLedger(final StatementFactory fact, final String id) throws LowlevelLedgerException, UnknownLedgerException {
!         super(id);
          this.fact = fact;
          create(fact);
***************
*** 124,163 ****
      }
  
-     /**
-      * This decides if new books are automatically created.
-      * 
-      * @return 
-      */
-     public final boolean allowAutoBookCreation() {
-         return false;
-     }
- 
-     public final boolean bookExists(final String bookID) throws LowlevelLedgerException {
-         try {
-             final PreparedStatement stmt = prepQuery("select id from book where id=?");
-             stmt.setString(1, bookID);
-             final ResultSet rs = stmt.executeQuery();
-             return rs.next();
-         } catch (SQLException e) {
-             throw new LowlevelLedgerException(this, e);
-         }
-     }
- 
-     public final Book createNewBook(final String bookID, final String title) throws BookExistsException, LowlevelLedgerException {
-         if (bookExists(bookID))
-             throw new BookExistsException(this, bookID);
-         try {
-             final PreparedStatement stmt = prepQuery("insert into book values (?,?,now())");
-             stmt.setString(1, bookID);
-             stmt.setString(2, title);
-             stmt.execute();
-             return createBookInstance(bookID, title);
-         } catch (SQLException e) {
-             rollbackUT();
-             throw new LowlevelLedgerException(this, e);
-         }
- 
-     }
- 
      /* (non-Javadoc)
  	 * @see org.neuclear.ledger.Ledger#performTransaction(org.neuclear.ledger.UnPostedTransaction)
--- 124,127 ----
***************
*** 174,180 ****
                  insertTransactionItem(xid, item);
              }
!             return this.createTransaction(transaction, xid);
          } catch (SQLException e) {
-             rollbackUT();
              throw new LowlevelLedgerException(this, e);
          }
--- 138,143 ----
                  insertTransactionItem(xid, item);
              }
!             return new PostedTransaction(transaction, new Date());
          } catch (SQLException e) {
              throw new LowlevelLedgerException(this, e);
          }
***************
*** 200,204 ****
                  insertHeldTransactionItem(xid, item);
              }
!             return this.createHeldTransaction(transaction, xid);
          } catch (SQLException e) {
              rollbackUT();
--- 163,167 ----
                  insertHeldTransactionItem(xid, item);
              }
!             return new PostedHeldTransaction(transaction, new Date());
          } catch (SQLException e) {
              rollbackUT();

[Neuclear-develop] neuclear-ledger-hibernate project.properties,1.2,1.3 project.xml,1.2,1.3

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13266

Modified Files:
	project.properties project.xml 
Log Message:
Added much to the Hibernate implementation:
- Added Hibernate business objects that mirror the internal Ledger objects for Transactions and Items.
- Added mapping documents
- Added hibernate.properties for using local hsqldb
- Implemented various of the processTransaction methods in HibernateLedger
Schema gets generated fine, but there are still issues in inserting the objects.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** project.properties	22 Mar 2004 23:21:12 -0000	1.2
--- project.properties	23 Mar 2004 21:57:50 -0000	1.3
***************
*** 19,23 ****
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/
! maven.repo.central = neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven
--- 19,23 ----
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://old.neuclear.org/maven/
! maven.repo.central = old.neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** project.xml	22 Mar 2004 23:21:12 -0000	1.2
--- project.xml	23 Mar 2004 21:57:50 -0000	1.3
***************
*** 98,101 ****
--- 98,105 ----
          </dependency>
          <dependency>
+             <id>commons-collections</id>
+             <version>2.1</version>
+         </dependency>
+         <dependency>
              <id>carol</id>
              <version>1.5.2</version>

[Neuclear-develop] neuclear-ledger-hibernate/src/java hibernate.properties,NONE,1.1

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-hibernate/src/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13266/src/java

Added Files:
	hibernate.properties 
Log Message:
Added much to the Hibernate implementation:
- Added Hibernate business objects that mirror the internal Ledger objects for Transactions and Items.
- Added mapping documents
- Added hibernate.properties for using local hsqldb
- Implemented various of the processTransaction methods in HibernateLedger
Schema gets generated fine, but there are still issues in inserting the objects.

--- NEW FILE: hibernate.properties ---
hibernate.connection.username=sa
hibernate.connection.password=
hibernate.connection.url=jdbc:hsqldb:target/test-data/hibernate
hibernate.connection.driver_class=org.hsqldb.jdbcDriver
hibernate.dialect=net.sf.hibernate.dialect.HSQLDialect

[Neuclear-develop] neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate HHeld.hbm.xml,NONE,1.1 HHeld.java,NONE,1.1 HHeldItem.hbm.xml,NONE,1.1 HHeldItem.java,NONE,1.1 HTransaction.hbm.xml,NONE,1.1 HTransaction.java,NONE,1.1 HTransactionItem.hbm.xml,NONE,1.1 HTransactionItem.java,NONE,1.1 HibernateLedger.java,1.2,1.3

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13266/src/java/org/neuclear/ledger/hibernate

Modified Files:
	HibernateLedger.java 
Added Files:
	HHeld.hbm.xml HHeld.java HHeldItem.hbm.xml HHeldItem.java 
	HTransaction.hbm.xml HTransaction.java 
	HTransactionItem.hbm.xml HTransactionItem.java 
Log Message:
Added much to the Hibernate implementation:
- Added Hibernate business objects that mirror the internal Ledger objects for Transactions and Items.
- Added mapping documents
- Added hibernate.properties for using local hsqldb
- Implemented various of the processTransaction methods in HibernateLedger
Schema gets generated fine, but there are still issues in inserting the objects.

--- NEW FILE: HHeldItem.java ---
package org.neuclear.ledger.hibernate;

/**
 * Created by IntelliJ IDEA.
 * User: pelleb
 * Date: Mar 23, 2004
 * Time: 10:33:27 AM
 * To change this template use File | Settings | File Templates.
 */
public class HHeldItem {
    public HHeldItem(HHeld held, String book, double amount) {
        this.book = book;
        this.amount = amount;
        this.held = held;
//        this.heldId=held.getId();
    }

    public HHeldItem() {
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getBook() {
        return book;
    }

    public void setBook(String book) {
        this.book = book;
    }

    public double getAmount() {
        return amount;
    }

    public void setAmount(double amount) {
        this.amount = amount;
    }

//    public String getHeldId() {
//        return heldId;
//    }
//
//    public void setHeldId(String heldId) {
//        this.heldId = heldId;
//    }

    public HHeld getHeld() {
        return held;
    }

    public void setHeld(HHeld held) {
        this.held = held;
    }

    private String id;
//    private String heldId;
    private HHeld held;
    private String book;
    private double amount;
}

--- NEW FILE: HTransactionItem.hbm.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE hibernate-mapping
    PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">

<hibernate-mapping>
    <class name="org.neuclear.ledger.hibernate.HTransactionItem"
        table="transaction_items">

        <id name="id" type="string"
            unsaved-value="null">
            <column name="id" sql-type="char(32)"
                not-null="true"/>
            <generator class="uuid.hex"/>
        </id>
        <property name="book">
            <column name="book" sql-type="char(32)"
                not-null="true"/>
        </property>
        <property name="amount">
            <column name="amount" sql-type="double"
                not-null="true"/>
        </property>
        <many-to-one name="transaction"
            class="org.neuclear.ledger.hibernate.HTransaction"
            column="transaction_id"
            update="false"
            insert="false"
            />

    </class>
</hibernate-mapping>
Index: HibernateLedger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HibernateLedger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HibernateLedger.java	22 Mar 2004 23:21:12 -0000	1.2
--- HibernateLedger.java	23 Mar 2004 21:57:48 -0000	1.3
***************
*** 31,36 ****
          try {
              Configuration cfg = new Configuration()
!                     .addClass(PostedTransaction.class)
!                     .addClass(PostedHeldTransaction.class);
              factory = cfg.buildSessionFactory();
          } catch (HibernateException e) {
--- 31,39 ----
          try {
              Configuration cfg = new Configuration()
!                     .addClass(HTransaction.class)
!                     .addClass(HTransactionItem.class)
!                     .addClass(HHeld.class)
!                     .addClass(HHeldItem.class);
! //            new net.sf.hibernate.tool.hbm2ddl.SchemaExport(cfg).create(true, true);
              factory = cfg.buildSessionFactory();
          } catch (HibernateException e) {
***************
*** 52,60 ****
              Session ses = factory.openSession();
              net.sf.hibernate.Transaction t = ses.beginTransaction();
!             PostedTransaction posted = new PostedTransaction(trans, new Date());
              ses.saveOrUpdate(posted);
              t.commit();
              ses.close();
!             return posted;
          } catch (HibernateException e) {
              throw new LowlevelLedgerException(e);
--- 55,63 ----
              Session ses = factory.openSession();
              net.sf.hibernate.Transaction t = ses.beginTransaction();
!             HTransaction posted = new HTransaction(trans, new Date());
              ses.saveOrUpdate(posted);
              t.commit();
              ses.close();
!             return posted.createPosted();
          } catch (HibernateException e) {
              throw new LowlevelLedgerException(e);
***************
*** 69,73 ****
       */
      public PostedTransaction performVerifiedTransfer(UnPostedTransaction trans) throws UnBalancedTransactionException, LowlevelLedgerException, InvalidTransactionException {
!         return null;
      }
  
--- 72,88 ----
       */
      public PostedTransaction performVerifiedTransfer(UnPostedTransaction trans) throws UnBalancedTransactionException, LowlevelLedgerException, InvalidTransactionException {
!         if (!trans.isBalanced())
!             throw new UnBalancedTransactionException(this, trans);
!         try {
!             Session ses = factory.openSession();
!             net.sf.hibernate.Transaction t = ses.beginTransaction();
!             HTransaction posted = new HTransaction(trans, new Date());
!             ses.saveOrUpdate(posted);
!             t.commit();
!             ses.close();
!             return posted.createPosted();
!         } catch (HibernateException e) {
!             throw new LowlevelLedgerException(e);
!         }
      }
  
***************
*** 80,84 ****
       */
      public PostedHeldTransaction performHeldTransfer(UnPostedHeldTransaction trans) throws UnBalancedTransactionException, LowlevelLedgerException, InvalidTransactionException {
!         return null;
      }
  
--- 95,111 ----
       */
      public PostedHeldTransaction performHeldTransfer(UnPostedHeldTransaction trans) throws UnBalancedTransactionException, LowlevelLedgerException, InvalidTransactionException {
!         if (!trans.isBalanced())
!             throw new UnBalancedTransactionException(this, trans);
!         try {
!             Session ses = factory.openSession();
!             net.sf.hibernate.Transaction t = ses.beginTransaction();
!             HHeld posted = new HHeld(trans, new Date());
!             ses.saveOrUpdate(posted);
!             t.commit();
!             ses.close();
!             return posted.createPosted();
!         } catch (HibernateException e) {
!             throw new LowlevelLedgerException(e);
!         }
      }
  
***************
*** 184,189 ****
      }
  
!     public void close() {
! 
      }
  
--- 211,220 ----
      }
  
!     public void close() throws LowlevelLedgerException {
!         try {
!             factory.close();
!         } catch (HibernateException e) {
!             throw new LowlevelLedgerException(e);
!         }
      }
  

--- NEW FILE: HTransaction.hbm.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE hibernate-mapping
    PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">

<hibernate-mapping>
    <class name="org.neuclear.ledger.hibernate.HTransaction"
        table="transactions">

        <id name="id" type="string"
            unsaved-value="null">
            <column name="id" sql-type="char(32)"
                not-null="true"/>
            <generator class="assigned"/>
        </id>
        <property name="requestId">
            <column name="reqid" sql-type="char(32)"
                not-null="true"/>
        </property>
        <property name="transactionTime">
            <column name="transactiontime" sql-type="double"
                not-null="true"/>
        </property>
        <property name="comment">
            <column name="comment" sql-type="varchar(256)"
                not-null="true"/>
        </property>
        <set name="items" table="transaction_items" inverse="true" cascade="all">
            <key column="transaction_id"/>
            <one-to-many class="org.neuclear.ledger.hibernate.HTransactionItem"/>
        </set>

    </class>
</hibernate-mapping>
--- NEW FILE: HHeld.hbm.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE hibernate-mapping
    PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">

<hibernate-mapping>
    <class name="org.neuclear.ledger.hibernate.HHeld"
        table="heldtransactions">

        <id name="id" type="string"
            unsaved-value="null">
            <column name="id" sql-type="char(32)"
                not-null="true"/>
            <generator class="assigned"/>
        </id>
        <property name="requestId">
            <column name="reqid" sql-type="char(32)"
                not-null="true"/>
        </property>
        <property name="transactionTime">
            <column name="transactiontime" sql-type="double"
                not-null="true"/>
        </property>
        <property name="expiryTime">
            <column name="expirytime" sql-type="double"
                not-null="true"/>
        </property>
        <property name="comment">
            <column name="comment" sql-type="varchar(256)"
                not-null="true"/>
        </property>
        <set name="items" table="held_items" inverse="true" cascade="all">
            <key column="held_id"/>
            <one-to-many class="org.neuclear.ledger.hibernate.HHeldItem"/>
        </set>

    </class>
</hibernate-mapping>
--- NEW FILE: HHeld.java ---
package org.neuclear.ledger.hibernate;

import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.PostedHeldTransaction;
import org.neuclear.ledger.TransactionItem;
import org.neuclear.ledger.UnPostedHeldTransaction;

import java.util.*;

/**
 * Created by IntelliJ IDEA.
 * User: pelleb
 * Date: Mar 23, 2004
 * Time: 10:29:34 AM
 * To change this template use File | Settings | File Templates.
 */
public class HHeld {

    public HHeld() {
    }

    public HHeld(UnPostedHeldTransaction tran, Date transactionTime) {
        this.id = tran.getId();
        this.requestId = tran.getRequestId();
        this.transactionTime = transactionTime;
        this.expiryTime = tran.getExpiryTime();
        this.comment = tran.getComment();
        final List ol = tran.getItemList();
        this.items = new HashSet(ol.size());
        for (int i = 0; i < ol.size(); i++) {
            TransactionItem item = (TransactionItem) ol.get(i);
            items.add(new HHeldItem(this, item.getBook(), item.getAmount()));
        }
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getRequestId() {
        return requestId;
    }

    public void setRequestId(String requestId) {
        this.requestId = requestId;
    }

    public Date getTransactionTime() {
        return transactionTime;
    }

    public void setTransactionTime(Date transactionTime) {
        this.transactionTime = transactionTime;
    }

    public Date getExpiryTime() {
        return expiryTime;
    }

    public void setExpiryTime(Date expiryTime) {
        this.expiryTime = expiryTime;
    }

    public String getComment() {
        return comment;
    }

    public void setComment(String comment) {
        this.comment = comment;
    }

    public Set getItems() {
        return items;
    }

    public void setItems(Set items) {
        this.items = items;
    }

    public PostedHeldTransaction createPosted() throws InvalidTransactionException {
        UnPostedHeldTransaction unp = new UnPostedHeldTransaction(id, requestId, comment, expiryTime);
        Iterator iter = items.iterator();
        while (iter.hasNext()) {
            HHeldItem item = (HHeldItem) iter.next();
            unp.addItem(item.getBook(), item.getAmount());
        }
        return new PostedHeldTransaction(unp, transactionTime);
    }

    private String id;
    private String requestId;
    private Date transactionTime;
    private Date expiryTime;
    private String comment;
    private Set items;
}

--- NEW FILE: HTransactionItem.java ---
package org.neuclear.ledger.hibernate;

/**
 * Created by IntelliJ IDEA.
 * User: pelleb
 * Date: Mar 23, 2004
 * Time: 10:33:27 AM
 * To change this template use File | Settings | File Templates.
 */
public class HTransactionItem {
    public HTransactionItem(HTransaction tran, String book, double amount) {
        this.book = book;
        this.amount = amount;
        this.transaction = tran;
//        this.transactionId=tran.getId();
    }

    public HTransactionItem() {
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getBook() {
        return book;
    }

    public void setBook(String book) {
        this.book = book;
    }

    public double getAmount() {
        return amount;
    }

    public void setAmount(double amount) {
        this.amount = amount;
    }

/*
    public String getTransactionId() {
        return transactionId;
    }

    public void setTransactionId(String transactionId) {
        this.transactionId = transactionId;
    }
*/

    public HTransaction getTransaction() {
        return transaction;
    }

    public void setTransaction(HTransaction transaction) {
        this.transaction = transaction;
    }

    private String id;
//    private String transactionId;
    private HTransaction transaction;
    private String book;
    private double amount;
}

--- NEW FILE: HHeldItem.hbm.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE hibernate-mapping
    PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">

<hibernate-mapping>
    <class name="org.neuclear.ledger.hibernate.HHeldItem"
        table="held_items">

        <id name="id" type="string"
            unsaved-value="null">
            <column name="id" sql-type="char(32)"
                not-null="true"/>
            <generator class="uuid.hex"/>
        </id>
        <!--        <property name="heldId" update="false" insert="false">-->
        <!--            <column name="held_id" sql-type="char(32)"-->
        <!--                    not-null="true"/>-->
        <!--        </property>-->
        <property name="book">
            <column name="book" sql-type="char(32)"
                not-null="true"/>
        </property>
        <property name="amount">
            <column name="amount" sql-type="double"
                not-null="true"/>
        </property>
        <many-to-one name="held" class="org.neuclear.ledger.hibernate.HHeld" column="held_id"
            update="false"
            insert="false"
            />

    </class>
</hibernate-mapping>
--- NEW FILE: HTransaction.java ---
package org.neuclear.ledger.hibernate;

import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.PostedTransaction;
import org.neuclear.ledger.TransactionItem;
import org.neuclear.ledger.UnPostedTransaction;

import java.util.*;

/**
 * Created by IntelliJ IDEA.
 * User: pelleb
 * Date: Mar 23, 2004
 * Time: 10:29:34 AM
 * To change this template use File | Settings | File Templates.
 */
public class HTransaction {

    public HTransaction() {
    }

    public HTransaction(UnPostedTransaction unp, Date transactionTime) {
        this.id = unp.getId();
        this.requestId = unp.getRequestId();
        this.transactionTime = transactionTime;
        this.comment = unp.getComment();
        final List ol = unp.getItemList();
        this.items = new HashSet(ol.size());
        for (int i = 0; i < ol.size(); i++) {
            TransactionItem item = (TransactionItem) ol.get(i);
            items.add(new HTransactionItem(this, item.getBook(), item.getAmount()));
        }
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getRequestId() {
        return requestId;
    }

    public void setRequestId(String requestId) {
        this.requestId = requestId;
    }

    public Date getTransactionTime() {
        return transactionTime;
    }

    public void setTransactionTime(Date transactionTime) {
        this.transactionTime = transactionTime;
    }

    public String getComment() {
        return comment;
    }

    public void setComment(String comment) {
        this.comment = comment;
    }

    public Set getItems() {
        return items;
    }

    public void setItems(Set items) {
        this.items = items;
    }

    public PostedTransaction createPosted() throws InvalidTransactionException {
        UnPostedTransaction unp = new UnPostedTransaction(id, requestId, comment);
        Iterator iter = items.iterator();
        while (iter.hasNext()) {
            HTransactionItem item = (HTransactionItem) iter.next();
            unp.addItem(item.getBook(), item.getAmount());
        }
        return new PostedTransaction(unp, transactionTime);
    }

    private String id;
    private String requestId;
    private Date transactionTime;
    private String comment;
    private Set items;
}

[Neuclear-develop] [JIRA] Updated: (GL-19) Hibernate Ledger Implementation

[<bug...@ve...>]

The following issue has been updated:

    Updater: Pelle Braendgaard (mailto:pe...@ve...)
       Date: Tue, 23 Mar 2004 2:02 PM
    Comment:
Most of the skeleton code is in place. I am working on getting the queries working correctly.
    Changes:
             Fix Version changed to r_0_4
    ---------------------------------------------------------------------
For a full history of the issue, see:

  http://jira.neuclear.org//browse/GL-19?page=history

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/GL-19

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: GL-19
    Summary: Hibernate Ledger Implementation
       Type: New Feature

     Status: In Progress
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Ledger
 Components: 
             SQL Ledger
   Fix Fors:
             r_0_4
   Versions:
             r_0_4

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Sat, 20 Mar 2004 4:23 PM
    Updated: Tue, 23 Mar 2004 2:02 PM

Description:
New implementation needed in Hibernate.
This should implement a BrowsableLedger as well for use in Web report generators.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] neuclear-xmlsig/xdocs bdg.xml,NONE,1.1 interop.xml,NONE,1.1 credits.xml,1.1.1.1,1.2 index.xml,1.4,1.5 installation.xml,1.2,1.3 navigation.xml,1.1.1.1,1.2 overview.xml,1.1.1.1,NONE

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29273/xdocs

Modified Files:
	credits.xml index.xml installation.xml navigation.xml 
Added Files:
	bdg.xml interop.xml 
Removed Files:
	overview.xml 
Log Message:
Added ExternalSignature and further Javadocs.
Added Busy Developers Guide and Interop guide.
Ready for release.

--- overview.xml DELETED ---

Index: index.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/xdocs/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.xml	12 Dec 2003 23:53:20 -0000	1.4
--- index.xml	23 Mar 2004 20:51:01 -0000	1.5
***************
*** 2,12 ****
  <document>
  
! 	<properties>
! 		<title>NeuClear.org - XML Signatures</title>
! 		<author email="pe...@ne...">Pelle Braendgaard</author>
! 	</properties>
  
! 	<body>
!    <section name="[12th of December 2003] Release 0.11">
              <p>
                  Panama City, 12th of December, 2003. We are happy to announce
--- 2,31 ----
  <document>
  
!     <properties>
!         <title>NeuClear.org - XML Signatures</title>
!         <author email="pe...@ne...">Pelle Braendgaard</author>
!     </properties>
  
!     <body>
!         <section name="[23rd of March 2004] Release 0.12">
!             <p>
!                         Panama City, 23rd of March 2004. We are happy to announce
!                         the 0.12 release of NeuClear XMLSIG. Major new features are:
!             </p>
!             <ul>
!                 <li>Improved verification of Reference Types</li>
!                 <li>Simpler API</li>
!                 <li>Support for X509 Certificates</li>
!                 <li>Improved Interoperability</li>
!             </ul>
!             <p>
!                 <a href="http://jira.neuclear.org/secure/ReleaseNote.jspa?projectId=10020&styleName=Html&version=10051">See full list.</a>
!             </p>
!             <p>
!                 <a href="http://sourceforge.net/project/showfiles.php?group_id=90470">Download it today and join in the NeuClear revolution</a>.
!             </p>
!         </section>
! 
!         <section name="[12th of December 2003] Release 0.11">
              <p>
                  Panama City, 12th of December, 2003. We are happy to announce
***************
*** 27,31 ****
                  Several minor improvements through the code, but the big news is
                  that most code unrelated to XML has been moved into the sister
!                 library <a href="http://neuclear.org/commons/">NeuClear Commons</a> library.
                  Making this a required library now.
              </p>
--- 46,51 ----
                  Several minor improvements through the code, but the big news is
                  that most code unrelated to XML has been moved into the sister
!                 library
!                 <a href="http://old.neuclear.org/commons/">NeuClear Commons</a> library.
                  Making this a required library now.
              </p>
***************
*** 48,53 ****
                      <li>Canonical XML</li>
                      <li>Canonical XML With Comments</li>
!                     <li><tt>RSAKeyValue</tt></li>
!                     <li><tt>DSAKeyValue</tt></li>
                  </ul>
                  Missing but coming soon are:
--- 68,77 ----
                      <li>Canonical XML</li>
                      <li>Canonical XML With Comments</li>
!                     <li>
!                         <tt>RSAKeyValue</tt>
!                     </li>
!                     <li>
!                         <tt>DSAKeyValue</tt>
!                     </li>
                  </ul>
                  Missing but coming soon are:
***************
*** 56,62 ****
                      <li>XPath Transforms (Already written but not integrated)</li>
                      <li>HMAC-SHA1 MAC</li>
!                     <li><tt>X509Data</tt></li>
                  </ul>
!                 Thanks to <a href="mailto:ra...@co...">Ramses Morales</a> for lots of help with this release.
                  Ramses has been added as developer/comitter on the project.
              </p>
--- 80,89 ----
                      <li>XPath Transforms (Already written but not integrated)</li>
                      <li>HMAC-SHA1 MAC</li>
!                     <li>
!                         <tt>X509Data</tt>
!                     </li>
                  </ul>
!                 Thanks to
!                 <a href="mailto:ra...@co...">Ramses Morales</a> for lots of help with this release.
                  Ramses has been added as developer/comitter on the project.
              </p>
***************
*** 72,83 ****
              </p>
          </section>
! 		<section name="Introduction">
! 			<p>
!                 XML Signature API is a simple implementation of the XML-Signature standard from <a href="http://www.w3c.org">W3C</a>.
                  The main difference of this over Apache's implementation is that it uses Dom4J and hopefully should be faster. This has never been verified
                  so take it with a grain of salt.
              </p>
! 		</section>
! 	</body>
  
  </document>
--- 99,111 ----
              </p>
          </section>
!         <section name="Introduction">
!             <p>
!                 XML Signature API is a simple implementation of the XML-Signature standard from
!                 <a href="http://www.w3c.org">W3C</a>.
                  The main difference of this over Apache's implementation is that it uses Dom4J and hopefully should be faster. This has never been verified
                  so take it with a grain of salt.
              </p>
!         </section>
!     </body>
  
  </document>

Index: installation.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/xdocs/installation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** installation.xml	12 Nov 2003 13:59:37 -0000	1.2
--- installation.xml	23 Mar 2004 20:51:01 -0000	1.3
***************
*** 2,18 ****
  <document>
  
! 	<properties>
! 		<title>Installing and Building</title>
! 		<author email="pe...@ne...">Pelle Braendgaard</author>
! 	</properties>
  
! 	<body>
! 		<section name="Requirements">
              <p>
                  The three main requirements for the library is:
                  <ul>
!                     <li><a href="http://www.bouncycastle.org">Bouncy Castle Crypto</a></li>
!                     <li><a href="http://www.dom4j.org">Dom4J</a></li>
!                     <li><a href="http://neuclear.org/commons/">NeuClear Commons</a></li>
                  </ul>
                  With Dom4J make sure you include the full jar in your classpath.
--- 2,24 ----
  <document>
  
!     <properties>
!         <title>Installing and Building</title>
!         <author email="pe...@ne...">Pelle Braendgaard</author>
!     </properties>
  
!     <body>
!         <section name="Requirements">
              <p>
                  The three main requirements for the library is:
                  <ul>
!                     <li>
!                         <a href="http://www.bouncycastle.org">Bouncy Castle Crypto</a>
!                     </li>
!                     <li>
!                         <a href="http://www.dom4j.org">Dom4J</a>
!                     </li>
!                     <li>
!                         <a href="http://old.neuclear.org/commons/">NeuClear Commons</a>
!                     </li>
                  </ul>
                  With Dom4J make sure you include the full jar in your classpath.
***************
*** 27,31 ****
              </p>
              <p>
!                 You also will need to edit your <tt>$JAVA_HOME/jre/lib/security/java.security</tt> file as well. Adding the following line:
              </p>
              <source>security.provider.6=org.bouncycastle.jce.provider.BouncyCastleProvider </source>
--- 33,38 ----
              </p>
              <p>
!                 You also will need to edit your
!                 <tt>$JAVA_HOME/jre/lib/security/java.security</tt> file as well. Adding the following line:
              </p>
              <source>security.provider.6=org.bouncycastle.jce.provider.BouncyCastleProvider </source>
***************
*** 34,38 ****
          <section name="Building">
              <p>
!                 To build anything within the NeuClear framework you first need to install <a href="http://jakarta.apache.org/turbine/maven/">Maven</a>.
                  Follow their installation instructions and you should be ok. I haven't tried this under windows yet, but I'm guessing
                  it should work fine.
--- 41,46 ----
          <section name="Building">
              <p>
!                 To build anything within the NeuClear framework you first need to install
!                 <a href="http://jakarta.apache.org/turbine/maven/">Maven</a>.
                  Follow their installation instructions and you should be ok. I haven't tried this under windows yet, but I'm guessing
                  it should work fine.
***************
*** 57,61 ****
              <source>~/projects/neuclear-xmlsig> maven jar:install</source>
              <p>
!                 If you use <a href="http://intellij.com">IntelliJ IDEA</a> maven will create a project file for you automatically:
              </p>
              <source>~/projects/neuclear-xmlsig> maven idea</source>
--- 65,70 ----
              <source>~/projects/neuclear-xmlsig> maven jar:install</source>
              <p>
!                 If you use
!                 <a href="http://intellij.com">IntelliJ IDEA</a> maven will create a project file for you automatically:
              </p>
              <source>~/projects/neuclear-xmlsig> maven idea</source>

Index: navigation.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/xdocs/navigation.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** navigation.xml	11 Nov 2003 16:33:52 -0000	1.1.1.1
--- navigation.xml	23 Mar 2004 20:51:01 -0000	1.2
***************
*** 1,22 ****
  <project name="neuclear" repository="neuclear" href="http://neuclear.org">
  
! 	<title>NeuClear - XML Signature Library</title>
  
! 	<body>
! 		<links>
              <item name="NeuClear" href="http://neuclear.org"/>
!             <item name="Wiki" href="http://wiki.neuclear.org/"/>
! 			<item name="Talk.org" href="http://talk.org"/>
! 			<item name="SourceForge" href="http://sourceforge.net/projects/neuclear/"/>
! 		</links>
! 		<menu name="NeuClear - XMLSig">
! 			<item name="Front Page"            href="/index.html"/>
!             <item name="Overview"            href="/overview.html"/>
              <item name="Installation" href="/installation.html"/>
              <item name="Credits and Dependencies" href="/credits.html"/>
! 			<item name="Downloads" href="http://sourceforge.net/project/showfiles.php?group_id=90470"/>
! 			<item name="SourceForge" href="http://sourceforge.net/projects/neuclear/"/>
! 		</menu>
! 	</body>
  
  </project>
--- 1,24 ----
  <project name="neuclear" repository="neuclear" href="http://neuclear.org">
  
!     <title>NeuClear - XML Signature Library</title>
  
!     <body>
!         <links>
              <item name="NeuClear" href="http://neuclear.org"/>
!             <item name="Issue Tracking" href="http://jira.neuclear.org"/>
!             <item name="Talk.org" href="http://talk.org"/>
!             <item name="SourceForge" href="http://sourceforge.net/projects/neuclear/"/>
!         </links>
!         <menu name="NeuClear - XMLSig">
!             <item name="Front Page" href="/index.html"/>
! 
!             <item name="Interoperability" href="/interop.html"/>
!             <item name="Busy Developers Guide" href="/bdg.html"/>
              <item name="Installation" href="/installation.html"/>
              <item name="Credits and Dependencies" href="/credits.html"/>
!             <item name="Downloads" href="http://sourceforge.net/project/showfiles.php?group_id=90470"/>
!             <item name="SourceForge" href="http://sourceforge.net/projects/neuclear/"/>
!         </menu>
!     </body>
  
  </project>

--- NEW FILE: bdg.xml ---
<?xml version="1.0"?>
<document>

    <properties>
        <title>Overview</title>
        <author email="pe...@ne...">Pelle Braendgaard</author>
    </properties>

    <body>
        <section name="Introduction">
            <p>
                The API was designed for absolute simplicity.  Almost everything can be done through several simple Static methods in
                <a href="apidocs/org/neuclear/xml/xmlsec/XMLSecTools.html">org.neuclear.xml.xmlsec.XMLSecTools</a>.
            </p>
        </section>
        <section name="Signing of XML Documents">
            <p>
                To sign a piece of XML you need two things:
                <ul>
                    <li>A
                        <a href="http://www.dom4j.org">Dom4J</a> XML
                        <a href="http://www.dom4j.org/apidocs/org/dom4j/Element.html">Element</a>
                    </li>
                    <li>An RSA Private Key</li>
                </ul>
                Look at the following code snippet for an example:
            </p>
            <source><![CDATA[// First we'll create a KeyPair
KeyPair kp=CryptoTools.createTinyRSAKeyPair();

Document doc=DocumentHelper.parseText("<test><test2/></test>");
Element elem=doc.getRootElement();

EnvelopedSignature envsig=new EnvelopedSignature(kp,elem);
System.out.println(doc.asXML());]]>
            </source>
            <p>This will leave you with the Element looking like this</p>
            <source> <![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<test><test2/><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<ds:Reference><ds:Transforms><ds:Transform ds:Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform ds:Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></ds:Transforms>
<ds:DigestMethod ds:Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
<ds:DigestValue>
B/P2qMqBvrZCYSa5RDuKHY9s8j4=
</ds:DigestValue></ds:Reference>
</ds:SignedInfo>
<ds:SignatureValue>gIYL0CM6xeniLgqRqPqsFEFx7Rrv7vKvW/sBlgoCyn7BlX+OTizulwGOFmw3Q9H5vFcSfFjTO8Y1TJcnIMnKzg==</ds:SignatureValue>
<ds:KeyInfo><ds:KeyValue><ds:RSAKeyValue><ds:Modulus>
zi2oiVe/tXSsGe8U1zT6znn2kFG3FXwjZ+NW8l2GcTd9zt1Y3dpScbUzzvbeQqfUw0uzPetRrK6h
fhCeo4D0Uw==
</ds:Modulus>
<ds:Exponent>
AQAB
</ds:Exponent>
</ds:RSAKeyValue>
</ds:KeyValue>
</ds:KeyInfo>
</ds:Signature></test>]]>
            </source>
            <p>
                This is what is known as an EnvelopedSignature, which simply speaking means that the XML element contains an
                embedded signature. This is the most usefull way of adding signatures to existing xml based applications.
                Once you have created an EnvelopedSignature. The signature is now a child of the Element that you passed to it.
                Remember if you make any further changes to your Document the signature will fail.
            </p>
        </section>
        <section name="Verification of XMLSignatures">
            <p>
                To Verify you need an Element contaning an embedded XML signature and a Public Key in its KeyInfo.
            </p>
            <source><![CDATA[try {
    EnvelopedSignature verified=new EnvelopedSignature(elem);
} catch (InvalidSignatureException e) {
    System.err.println("Invalid Signature");
}            ]]></source>
        </section>
        <section name="Data Object Signatures">
            <p>
                Another common form of the XML Signature is the Data Object Signature. This is a type of signature
                known as Enveloping XML Signature. What this means is that the top level element of the Document is now the
                Signature element and the data is enveloped within the signature.
            </p>
            <p>
                A common scenario of Enveloping Signatures are Data Object Signatures. The element that you wish to sign
                is known as the Data Object and is included in a Object element within the signature.
            </p>
            <source><![CDATA[ KeyPair kp=CryptoTools.createTinyRSAKeyPair();

Document doc=DocumentHelper.parseText("<test><test2/></test>");
Element elem=doc.getRootElement();

DataObjectSignature datasig=new DataObjectSignature(kp,elem);
Element sigelem=datasig.getElement();
System.out.println(sigelem.asXML()); ]]></source>
            <p>
            Verification is done similarly to EnvelopedSignatures. You just pass the element to the constructor:
            </p>
            <source><![CDATA[try {
    DataObjectSignature verified=new DataObjectSignature(elem);
} catch (InvalidSignatureException e) {
    System.err.println("Invalid Signature");
}            ]]></source>

        </section>
        <section name="External URL Signatures">
            <p>
                A third common form of the XML Signature is the External Signature. This signs some external data
                that is referenced through a URL. You can use this to perform a signature of any url that is
                compliant with the Java URL class. Such as http, https, ftp etc and file.
            </p>
            <source><![CDATA[ KeyPair kp=CryptoTools.createTinyRSAKeyPair();

ExternalSignature extsig=new ExternalSignature(kp,""http://www.w3.org/TR/2000/WD-xml-c14n-20001011");
Element sigelem=extsig.getElement();
System.out.println(sigelem.asXML()); ]]></source>
            <p>
            Verification is done similarly to EnvelopedSignatures. You just pass the element to the constructor:
            </p>
            <source><![CDATA[try {
    ExternalSignature verified=new ExternalSignature(elem);
} catch (InvalidSignatureException e) {
    System.err.println("Invalid Signature");
}            ]]></source>

        </section>
        <section name="Reference Security Restrictions">
            <p>
                The XML Signature standard is very flexible and can be used for all sorts of applications, however the
                down fall of this flexibility is that it leaves a large responsibility on the application designers that most
                people miss. This has got to do with the way the standard specifies References (what is signed essentially).
                A common but very serious security problem with XML Signatures are not checking what exactly is signed.
            </p>
            <p>
                As opposed to most other implementations we have decided to impose some restrictions on what is possible.
                You can use. Most common types of digital signatures (see above) have got specific Java constructors to both verify and create them
                safely. If you have certain needs not met by these you can create your own subclasses of XMLSignature to handle this.
                We include a class called AnyXMLSignature. This should never be used in production environments. This will
                verify arbitrary signatures. It is included for compliance testing only. Please DO NOT USE.
            </p>
        </section>
        <section name="Canonicalization">
            <p>
                To Canonicalize a document according to
                <a href="http://www.w3.org/TR/2000/WD-xml-c14n-20001011">Canonical XML</a>.
                You need a document and a Writer.
            </p>
            <source><![CDATA[
Canonicalizer canon=new Canonicalizer(writer);//writer is a preinitialized instance of a java.io.Writer
canon.canonicalize(doc); // Canonicalizes the document or element and outputs it to the writer
            ]]></source>
        </section>
        <!--        <section name="Encoding Public Key's in XML Documents">
        <p>

        </p>
        </section>-->
    </body>

</document>

Index: credits.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/xdocs/credits.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** credits.xml	11 Nov 2003 16:33:52 -0000	1.1.1.1
--- credits.xml	23 Mar 2004 20:51:01 -0000	1.2
***************
*** 2,22 ****
  <document>
  
! 	<properties>
! 		<title>Credits and Dependencies</title>
! 		<author email="pe...@ne...">Pelle Braendgaard</author>
! 	</properties>
  
! 	<body>
! 		<section name="Dependencies">
              <p>
                  We are currently using the following libraries quite heavily:
                  <ul>
!                     <li><a href="http://www.bouncycastle.org">Bouncy Castle for Crypto</a></li>
!                     <li><a href="http://www.dom4j.org">Dom4J - XML API</a></li>
!                     <li><a href="http://jakarta.apache.org/turbine/maven/">Maven - for Building</a></li>
!                     <li><a href="http://www.opensymphony.org">OpenSymphony - OSCore</a></li>
!                     <li><a href="http://jakarta.apache.org/commons/regexp/">Apache Jakarta Commons RegExp</a></li>
!                     <li><a href="http://jakarta.apache.org/commons/cli/">Apache Jakarta Commons CLI</a></li>
!                </ul>
  
              </p>
--- 2,25 ----
  <document>
  
!     <properties>
!         <title>Credits and Dependencies</title>
!         <author email="pe...@ne...">Pelle Braendgaard</author>
!     </properties>
  
!     <body>
!         <section name="Dependencies">
              <p>
                  We are currently using the following libraries quite heavily:
                  <ul>
!                     <li>
!                         <a href="http://www.bouncycastle.org">Bouncy Castle for Crypto</a>
!                     </li>
!                     <li>
!                         <a href="http://www.dom4j.org">Dom4J - XML API</a>
!                     </li>
!                     <li>
!                         <a href="http://jakarta.apache.org/turbine/maven/">Maven - for Building</a>
!                     </li>
!                 </ul>
  
              </p>
***************
*** 24,28 ****
          <section name="Credits">
              <p>
!                 This is inspired by <a href="http://xml.apache.org">XML-Security</a> package for XML-Signatures. But when
                  we went from using DOM to Dom4J, we decided to write our own implementation ontop of Dom4J. While we have rewritten most things we owe
                  a debt of gratitude for the inspiration from XML-Security. In a few cases we simply ported the apache code to dom4j. I'm not 100% sure of the
--- 27,32 ----
          <section name="Credits">
              <p>
!                 This is inspired by
!                 <a href="http://xml.apache.org">XML-Security</a> package for XML-Signatures. But when
                  we went from using DOM to Dom4J, we decided to write our own implementation ontop of Dom4J. While we have rewritten most things we owe
                  a debt of gratitude for the inspiration from XML-Security. In a few cases we simply ported the apache code to dom4j. I'm not 100% sure of the

--- NEW FILE: interop.xml ---
<?xml version="1.0"?>
<document>

    <properties>
        <title>Interopability</title>
        <author email="pe...@ne...">Pelle Braendgaard</author>
    </properties>

    <body>
        <section name="Overview">
            <p>
                This library was written to support the
                <a href="http://neuclear.org">NeuClear</a> project. As such
                most of the features of our support of the standard are designed to support the needs of this project.
                We provide interoperability of all the features that we need and then some. However we do not offer full
                interoperability as there are features that we will never use in NeuClear. If anyone wants to implement them,
                please let us know and we will happily include them.
            </p>
        </section>
        <section name="Missing Features">
            <p>
                Missing features as required by the W3C Standard on
                <a href="http://www.w3.org/2000/09/xmldsig">XML Signatures</a> are:
                <ul>
                    <li>Exclusive Canonicalization</li>
                    <li>Most PKI related functionality</li>
                    <li>Any external Public Key</li>
                    <li>HMAC support</li>
                </ul>
            </p>
        </section>
        <section name="Interops">
            <p>
                <table cellpadding="2" cellspacing="2" border="1">
                    <tbody>
                        <tr>
                            <td valign="top" align="left">
                                <b>Features and algorithms
                                    <br/>
                                </b>
                            </td>
                            <td valign="top" align="left">
                                <b>Key Word
                                    <br/>
                                </b>
                            </td>
                            <td valign="top" align="left">
                                <b>NeuClear XMLSig version 0.6 </b>
                            </td>

                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a class="link-def" href="http://www.w3.org/TR/2000/WD-xmldsig-core-20001012/#def-SignatureDetac%20hed">
Detached</a> Signature
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a class="link-def" href="http://www.w3.org/TR/2000/WD-xmldsig-core-20001012/#def-SignatureEnveloping">
Enveloping</a> Signature: same document reference with fragment (URI="#Object1")
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>

                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a class="link-def" href="http://www.w3.org/TR/2000/WD-xmldsig-core-20001012/#def-SignatureEnvel%20oped">
Enveloped</a> Signature: same document reference (URI="") with
                                <a href="http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html#sec-EnvelopedSignature">
Enveloped Signature Transform</a> .
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/2000/WD-xmldsig-core-20001012/#sec-SignatureValue%20">
SignatureValue</a> generation/validation
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"> Manifest</a> DigestValue
generation/valdiation
                                <br/>
                            </td>
                            <td valign="top" align="left">MAY</td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left"> Feature:
                                <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"> laxly schema valid
Signature element</a> generation
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>

                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/xmldsig-core/#sec-ReferenceProcessingModel"> XPointers</a>
'#xpointer(/)'
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/xmldsig-core/#sec-ReferenceProcessingModel"> XPointers</a>
'#xpointer(id("
                                <em>ID</em>"))'
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>

                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/xmldsig-core/#sec-ReferenceProcessingModel"> XPointers</a>:
full suppport
                            </td>
                            <td valign="top" align="left">MAY
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/xmldsig-core/#sec-XPath"> XPath</a>
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left"> the dsig
                                <a href="http://www.w3.org/TR/xmldsig-core/#sec-XPath"> XPath 'here()'</a>
function (can be used to implement enveloped signature)
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left"> XSLT (note, the child
                                <code> XSLT</code>
element of Transform has been   deprecated.)
                                <br/>
                            </td>
                            <td valign="top" align="left">MAY
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left"> RetrievalMethod (e.g., X509Data)
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/2000/09/xmldsig#sha1"> SHA1</a>
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/2000/09/xmldsig#base64"> Base64</a>
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> HMAC-SHA1</a>
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/2000/09/xmldsig#dsa"> DSAwithSHA1
                                    <br/>
 (DSS)
                                </a>
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <a href="#dsa-sha1"></a>
                                <br/>
                            </td>

                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/2000/09/xmldsig#rsa-sha1"> RSAwithSHA1</a>
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top">X509 support
                                <br/>
                            </td>
                            <td valign="top">SHOULD
                                <br/>
                            </td>
                            <td valign="top">Limited to verifying with embedded X509 certificates.
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/2000/09/xmldsig#minimal"> minimal</a> (deprecated)
                                <br/>
                            </td>
                            <td valign="top" align="left">n/a
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/2000/WD-xml-c14n-20001011"> Canonical XML</a>
(20010315)
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/2000/WD-xml-c14n-20001011"> Canonical XML</a>
with comments
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/2002/CR-xml-exc-c14n-20020212"> Exlusive Canonical
XML</a>
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/TR/2002/CR-xml-exc-c14n-20020212"> Exlusive Canonical
XML</a> with comments
                                <br/>
                            </td>
                            <td valign="top" align="left">SHOULD
                                <br/>
                            </td>
                            <td valign="top" align="left">N
                                <br/>
                            </td>
                        </tr>
                        <tr>
                            <td valign="top" align="left">
                                <a href="http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html#sec-EnvelopedSignature">
Enveloped Signature</a>
                                <br/>
                            </td>
                            <td valign="top" align="left">MUST
                                <br/>
                            </td>
                            <td valign="top" align="left">Y
                                <br/>
                            </td>
                        </tr>
                    </tbody>
                </table>
            </p>
        </section>
    </body>
</document>

[Neuclear-develop] neuclear-xmlsig project.properties,1.6,1.7 project.xml,1.11,1.12

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29273

Modified Files:
	project.properties project.xml 
Log Message:
Added ExternalSignature and further Javadocs.
Added Busy Developers Guide and Interop guide.
Ready for release.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** project.properties	11 Dec 2003 16:16:05 -0000	1.6
--- project.properties	23 Mar 2004 20:51:01 -0000	1.7
***************
*** 15,22 ****
  maven.ui.href.link.selfref = #ff6666
  
! maven.repo.central = neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/
  #maven.test.skip=true
--- 15,22 ----
  maven.ui.href.link.selfref = #ff6666
  
! maven.repo.central = old.neuclear.org
  maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven
  maven.jar.manifest.extensions.add = false
  #maven.ui.property.file = ui.properties
! maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://old.neuclear.org/maven/
  #maven.test.skip=true

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** project.xml	13 Jan 2004 15:11:41 -0000	1.11
--- project.xml	23 Mar 2004 20:51:01 -0000	1.12
***************
*** 2,12 ****
  <project>
  
!     <name>NeuDist XML Signature API</name>
      <id>neuclear-xmlsig</id>
!     <currentVersion>0.12-SNAPSHOT</currentVersion>
      <inceptionYear>2002</inceptionYear>
      <package>org.neuclear</package>
      <logo>/images/logo.gif</logo>
!     <shortDescription>NeuDist XML Signature API</shortDescription>
      <organization>
          <name>Antilles Software Ventures SA</name>
--- 2,12 ----
  <project>
  
!     <name>NeuClear XML Signature API</name>
      <id>neuclear-xmlsig</id>
!     <currentVersion>0.12</currentVersion>
      <inceptionYear>2002</inceptionYear>
      <package>org.neuclear</package>
      <logo>/images/logo.gif</logo>
!     <shortDescription>NeuClear XML Signature API</shortDescription>
      <organization>
          <name>Antilles Software Ventures SA</name>
***************
*** 19,23 ****
      </description>
  
!     <url>http://neuclear.org/</url>
      <repository>
          <connection>
--- 19,23 ----
      </description>
  
!     <url>http://old.neuclear.org/xmlsig/</url>
      <repository>
          <connection>
***************
*** 29,35 ****
      </repository>
  
!     <siteAddress>neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/xmlsig/</siteDirectory>
!     <issueTrackingUrl>http://neuclear.org:8080/jira/secure/BrowseProject.jspa</issueTrackingUrl>
      <mailingLists>
          <mailingList>
--- 29,35 ----
      </repository>
  
!     <siteAddress>old.neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/xmlsig/</siteDirectory>
!     <issueTrackingUrl>http://jira.neuclear.org</issueTrackingUrl>
      <mailingLists>
          <mailingList>
***************
*** 76,80 ****
              <id>neuclear-commons</id>
              <name>neuclear-commons</name>
!             <version>0.6-SNAPSHOT</version>
              <properties>
                  <war.bundle>true</war.bundle>
--- 76,80 ----
              <id>neuclear-commons</id>
              <name>neuclear-commons</name>
!             <version>0.6</version>
              <properties>
                  <war.bundle>true</war.bundle>

[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec ExternalSignature.java,NONE,1.1 AnyXMLSignature.java,1.1,1.2 DataObjectSignature.java,1.1,1.2 EnvelopedSignature.java,1.1,1.2 InvalidReferencesException.java,1.1,1.2 SignedInfo.java,1.6,1.7 XMLSignature.java,1.18,1.19

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29273/src/java/org/neuclear/xml/xmlsec

Modified Files:
	AnyXMLSignature.java DataObjectSignature.java 
	EnvelopedSignature.java InvalidReferencesException.java 
	SignedInfo.java XMLSignature.java 
Added Files:
	ExternalSignature.java 
Log Message:
Added ExternalSignature and further Javadocs.
Added Busy Developers Guide and Interop guide.
Ready for release.

Index: AnyXMLSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/AnyXMLSignature.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AnyXMLSignature.java	19 Mar 2004 22:21:51 -0000	1.1
--- AnyXMLSignature.java	23 Mar 2004 20:50:59 -0000	1.2
***************
*** 8,12 ****
   */
  public class AnyXMLSignature extends XMLSignature {
!     public AnyXMLSignature(Element elem) throws XMLSecurityException, InvalidSignatureException {
          super(XMLSecTools.getSignatureElement(elem));
      }
--- 8,12 ----
   */
  public class AnyXMLSignature extends XMLSignature {
!     AnyXMLSignature(Element elem) throws XMLSecurityException, InvalidSignatureException {
          super(XMLSecTools.getSignatureElement(elem));
      }

--- NEW FILE: ExternalSignature.java ---
package org.neuclear.xml.xmlsec;

import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.neuclear.commons.Utility;
import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
import org.neuclear.commons.crypto.signers.NonExistingSignerException;
import org.neuclear.commons.crypto.signers.Signer;

import java.security.KeyPair;
import java.util.List;

/**
 * This is a standard Enveloped Signature with only one Reference object.
 */
public class ExternalSignature extends XMLSignature {
    public ExternalSignature(Element elem) throws XMLSecurityException, InvalidSignatureException {
        super(elem);
    }

    /**
     * Creates a Signature with a reference to an external URL.
     *
     * @param name
     * @param signer
     * @param url
     * @throws XMLSecurityException
     * @throws UserCancellationException
     * @throws NonExistingSignerException
     */
    public ExternalSignature(String name, Signer signer, String url) throws XMLSecurityException, UserCancellationException, NonExistingSignerException {
        super(name, signer);
        if (getElement().getDocument() == null)
            DocumentHelper.createDocument(getElement());
        si.addExternalReference(url);
        sign(name, signer);
    }

    public ExternalSignature(KeyPair kp, String url) throws XMLSecurityException {
        super(kp.getPublic());
        if (getElement().getDocument() == null)
            DocumentHelper.createDocument(getElement());
        si.addExternalReference(url);
        sign(kp);
    }

    protected void verifyReferencesStructure() throws InvalidReferencesException {
        List refs = si.getReferences();
        if (refs.size() != 1)
            throw new InvalidReferencesException(refs.size());
        if (Utility.isEmpty(si.getPrimaryReference().getUri()))
            throw new InvalidReferencesException();

    }

}

Index: DataObjectSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/DataObjectSignature.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DataObjectSignature.java	19 Mar 2004 22:21:51 -0000	1.1
--- DataObjectSignature.java	23 Mar 2004 20:51:00 -0000	1.2
***************
*** 7,10 ****
--- 7,11 ----
  import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.commons.crypto.signers.Signer;
+ import org.neuclear.xml.XMLTools;
  
  import java.security.KeyPair;
***************
*** 12,28 ****
  
  /**
!  * This is a standard Enveloped Signature with only one Reference object.
   */
  public class DataObjectSignature extends XMLSignature {
      public DataObjectSignature(Element elem) throws XMLSecurityException, InvalidSignatureException {
          super(elem);
      }
  
!     public DataObjectSignature(String name, Signer signer, Element elem) throws XMLSecurityException, UserCancellationException, NonExistingSignerException {
!         super(name, signer);
          si.addEnvelopingReference(addDataObject("data", elem));
!         sign(name, signer);
      }
  
      public DataObjectSignature(KeyPair kp, Element elem) throws XMLSecurityException {
          super(kp.getPublic());
--- 13,56 ----
  
  /**
!  * This is a standard Enveloping Signature with only one data object object.
   */
  public class DataObjectSignature extends XMLSignature {
+ 
+     /**
+      * Verifies an Enveloping Signature with a Data Object.
+      *
+      * @param elem
+      * @throws XMLSecurityException
+      * @throws InvalidSignatureException
+      */
      public DataObjectSignature(Element elem) throws XMLSecurityException, InvalidSignatureException {
          super(elem);
      }
  
!     /**
!      * Creates a new Enveloping Signature containing one data object. Uses the given Signer and alias to
!      * sign it.
!      *
!      * @param alias
!      * @param signer
!      * @param elem   Element to embed in Data Object
!      * @throws XMLSecurityException
!      * @throws UserCancellationException
!      * @throws NonExistingSignerException
!      * @see Signer
!      */
!     public DataObjectSignature(String alias, Signer signer, Element elem) throws XMLSecurityException, UserCancellationException, NonExistingSignerException {
!         super(alias, signer);
          si.addEnvelopingReference(addDataObject("data", elem));
!         sign(alias, signer);
      }
  
+     /**
+      * Creates a new Enveloping Signature containing one data object. Signs it using the given KeyPair
+      *
+      * @param kp
+      * @param elem Element to embed in Data Object
+      * @throws XMLSecurityException
+      */
      public DataObjectSignature(KeyPair kp, Element elem) throws XMLSecurityException {
          super(kp.getPublic());
***************
*** 35,41 ****
          if (refs.size() != 1)
              throw new InvalidReferencesException(refs.size());
!         if (Utility.isEmpty(si.getPrimaryReference().getUri()))
!             throw new InvalidReferencesException();
! 
      }
  
--- 63,77 ----
          if (refs.size() != 1)
              throw new InvalidReferencesException(refs.size());
!         final String uri = si.getPrimaryReference().getUri();
!         if (Utility.isEmpty(uri))
!             throw new InvalidReferencesException("Empty URI");
!         if (!uri.startsWith("#"))
!             throw new InvalidReferencesException("URI does not start with '#'");
!         final String id = uri.substring(1);
!         Element object = XMLTools.getByID(getElement(), id);
!         if (object == null)
!             throw new InvalidReferencesException("Object with id: " + id + " is null");
!         if (!object.getName().equals("Object"))
!             throw new InvalidReferencesException("Referenced object is not an Object element, but a: " + object.getName());
      }
  

Index: InvalidReferencesException.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/InvalidReferencesException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InvalidReferencesException.java	19 Mar 2004 22:21:51 -0000	1.1
--- InvalidReferencesException.java	23 Mar 2004 20:51:00 -0000	1.2
***************
*** 17,19 ****
--- 17,23 ----
      }
  
+     public InvalidReferencesException(String message) {
+         super("Invalid reference type: " + message);
+     }
+ 
  }

Index: EnvelopedSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/EnvelopedSignature.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EnvelopedSignature.java	19 Mar 2004 22:21:51 -0000	1.1
--- EnvelopedSignature.java	23 Mar 2004 20:51:00 -0000	1.2
***************
*** 14,21 ****
--- 14,41 ----
   */
  public class EnvelopedSignature extends XMLSignature {
+     /**
+      * Verifies the given element. The Element can be either the Signature element embedded within another element or
+      * the parent element it self.
+      *
+      * @param elem
+      * @throws XMLSecurityException
+      * @throws InvalidSignatureException
+      */
      public EnvelopedSignature(Element elem) throws XMLSecurityException, InvalidSignatureException {
          super(XMLSecTools.getSignatureElement(elem));
      }
  
+     /**
+      * Creates a standard Enveloped Signature within the given Element.
+      * Uses the provided Signer and Alias to sign it.
+      *
+      * @param name
+      * @param signer
+      * @param elem
+      * @throws XMLSecurityException
+      * @throws UserCancellationException
+      * @throws NonExistingSignerException
+      * @see Signer
+      */
      public EnvelopedSignature(String name, Signer signer, Element elem) throws XMLSecurityException, UserCancellationException, NonExistingSignerException {
          super(name, signer);
***************
*** 25,28 ****
--- 45,56 ----
      }
  
+     /**
+      * Creates a standard Enveloped Signature within the given Element.
+      * Uses the provided KeyPair to sign it.
+      *
+      * @param kp
+      * @param elem
+      * @throws XMLSecurityException
+      */
      public EnvelopedSignature(KeyPair kp, Element elem) throws XMLSecurityException {
          super(kp.getPublic());

Index: XMLSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** XMLSignature.java	20 Mar 2004 17:19:42 -0000	1.18
--- XMLSignature.java	23 Mar 2004 20:51:00 -0000	1.19
***************
*** 1,4 ****
--- 1,9 ----
  /* $Id$
   * $Log$
+  * Revision 1.19  2004/03/23 20:51:00  pelle
+  * Added ExternalSignature and further Javadocs.
+  * Added Busy Developers Guide and Interop guide.
+  * Ready for release.
+  *
   * Revision 1.18  2004/03/20 17:19:42  pelle
   * The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
***************
*** 225,235 ****
   */
  abstract public class XMLSignature extends AbstractXMLSigElement {
! 
      protected XMLSignature(final PublicKey pub) throws XMLSecurityException {
          this(pub, new SignedInfo(getSignatureAlgorithm(pub), 1));
      }
  
!     protected XMLSignature(final String name, final Signer signer) throws XMLSecurityException, NonExistingSignerException {
!         this(getPublicKey(name, signer), new SignedInfo(getSignatureAlgorithm(getPublicKey(name, signer)), 1));
      }
  
--- 230,255 ----
   */
  abstract public class XMLSignature extends AbstractXMLSigElement {
!     /**
!      * Creates a raw XML Signature element that is unsigned.
!      * Subclasse can use this to add references and then sign it using the sign method.
!      *
!      * @param pub Adds this public key to the KeyInfo
!      * @throws XMLSecurityException
!      */
      protected XMLSignature(final PublicKey pub) throws XMLSecurityException {
          this(pub, new SignedInfo(getSignatureAlgorithm(pub), 1));
      }
  
!     /**
!      * Creates a raw XML Signature element that is unsigned.
!      * Subclasse can use this to add references and then sign it using the sign method.
!      *
!      * @param alias  Adds the publickey with this alias to the KeyInfo
!      * @param signer Get the PublicKey from this Signer
!      * @throws XMLSecurityException
!      * @throws NonExistingSignerException
!      */
!     protected XMLSignature(final String alias, final Signer signer) throws XMLSecurityException, NonExistingSignerException {
!         this(getPublicKey(alias, signer), new SignedInfo(getSignatureAlgorithm(getPublicKey(alias, signer)), 1));
      }
  
***************
*** 243,246 ****
--- 263,274 ----
      }
  
+     /**
+      * Used by subclasses to pass complete SignedInfo's.
+      * This constructor signs it and places signature in Signature Value.
+      *
+      * @param kp
+      * @param si
+      * @throws XMLSecurityException
+      */
      protected XMLSignature(final KeyPair kp, final SignedInfo si) throws XMLSecurityException {
          this(kp.getPublic(), si);
***************
*** 248,260 ****
      }
  
! 
!     protected XMLSignature(final String name, final Signer signer, final SignedInfo si) throws XMLSecurityException, UserCancellationException, NonExistingSignerException {
!         this(getPublicKey(name, signer), si);
!         sign(name, signer);
      }
  
  
      /**
!      * Constructor from Raw XML
       *
       * @param elem
--- 276,299 ----
      }
  
!     /**
!      * Used by subclasses to pass complete SignedInfo's.
!      * This constructor signs it and places signature in Signature Value.
!      *
!      * @param alias
!      * @param signer
!      * @param si
!      * @throws XMLSecurityException
!      * @throws UserCancellationException
!      * @throws NonExistingSignerException
!      */
!     protected XMLSignature(final String alias, final Signer signer, final SignedInfo si) throws XMLSecurityException, UserCancellationException, NonExistingSignerException {
!         this(getPublicKey(alias, signer), si);
!         sign(alias, signer);
      }
  
  
      /**
!      * Constructor from Raw XML. This verifies the Signature and references within.
!      * Sub classes should override <tt>verifyReferencesStructure()</tt> to verify the structure of the references.
       *
       * @param elem
***************
*** 304,326 ****
      }
  
      protected void sign(final KeyPair kp) throws XMLSecurityException {
          sigval.setText(Base64.encode(si.sign(kp.getPrivate())));
      }
  
!     protected void sign(final String name, final Signer signer) throws XMLSecurityException, NonExistingSignerException, UserCancellationException {
!         sigval.setText(Base64.encode(si.sign(name, signer)));
      }
  
  
!     private static PublicKey getPublicKey(final String name, final Signer signer) throws XMLSecurityException, NonExistingSignerException {
          if (!(signer instanceof PublicKeySource))
              throw new XMLSecurityException("The Signer must also be a public key source");
!         return ((PublicKeySource) signer).getPublicKey(name);
      }
  
      /**
!      * Method getPublicKey
!      * 
!      * @return 
       * @throws XMLSecurityException 
       */
--- 343,380 ----
      }
  
+     /**
+      * Signs the SignedInfo with the given KeyPair and places the signature in the SignatureValue element.
+      * Subclasses should call this in their constructor.
+      *
+      * @param kp
+      * @throws XMLSecurityException
+      */
      protected void sign(final KeyPair kp) throws XMLSecurityException {
          sigval.setText(Base64.encode(si.sign(kp.getPrivate())));
      }
  
!     /**
!      * Signs the SignedInfo with the given Signer and alias and places the signature in the SignatureValue element.
!      * Subclasses should call this in their constructor.
!      *
!      * @param alias
!      * @param signer
!      * @throws XMLSecurityException
!      * @throws NonExistingSignerException
!      * @throws UserCancellationException
!      */
!     protected void sign(final String alias, final Signer signer) throws XMLSecurityException, NonExistingSignerException, UserCancellationException {
!         sigval.setText(Base64.encode(si.sign(alias, signer)));
      }
  
  
!     private static PublicKey getPublicKey(final String alias, final Signer signer) throws XMLSecurityException, NonExistingSignerException {
          if (!(signer instanceof PublicKeySource))
              throw new XMLSecurityException("The Signer must also be a public key source");
!         return ((PublicKeySource) signer).getPublicKey(alias);
      }
  
      /**
!      * @return The signature bytes
       * @throws XMLSecurityException 
       */
***************
*** 330,333 ****
--- 384,393 ----
      }
  
+     /**
+      * Gets the PublicKey of the Signer of the XMLSignature. If non existant returns null.
+      *
+      * @return
+      * @throws XMLSecurityException
+      */
      public final PublicKey getSignersKey() throws XMLSecurityException {
          KeyInfo key = getKeyInfo();
***************
*** 337,340 ****
--- 397,406 ----
      }
  
+     /**
+      * If available returns the id of the signing key.
+      *
+      * @return
+      * @throws XMLSecurityException
+      */
      public final String getSignersId() throws XMLSecurityException {
          KeyInfo key = getKeyInfo();
***************
*** 353,360 ****
--- 419,434 ----
      }
  
+     /**
+      * @return The SignedInfo element
+      */
      public final SignedInfo getSi() {
          return si;
      }
  
+     /**
+      * Get the first element referenced by this Signature. If refernce is external it returns null.
+      *
+      * @return
+      */
      public final Element getPrimaryReferenceElement() {
          return si.getPrimaryReferenceElement();

Index: SignedInfo.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/SignedInfo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SignedInfo.java	20 Mar 2004 17:19:42 -0000	1.6
--- SignedInfo.java	23 Mar 2004 20:51:00 -0000	1.7
***************
*** 1,4 ****
--- 1,9 ----
  /* $Id$
   * $Log$
+  * Revision 1.7  2004/03/23 20:51:00  pelle
+  * Added ExternalSignature and further Javadocs.
+  * Added Busy Developers Guide and Interop guide.
+  * Ready for release.
+  *
   * Revision 1.6  2004/03/20 17:19:42  pelle
   * The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
***************
*** 285,289 ****
  //            System.out.println(new String(cansi));
  //            System.out.println("------");
! 
              return CryptoTools.sign(key, cansi);
          } catch (CryptoException e) {
--- 290,295 ----
  //            System.out.println(new String(cansi));
  //            System.out.println("------");
!             if (cansi.length == 0)
!                 throw new XMLSecurityException("Problem during Canonicalization. The Canonicalizer Returned a null byte array.");
              return CryptoTools.sign(key, cansi);
          } catch (CryptoException e) {

[Neuclear-develop] neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec SimpleXMLSigTest.java,1.12,1.13

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29273/src/test/org/neuclear/xml/xmlsec

Modified Files:
	SimpleXMLSigTest.java 
Log Message:
Added ExternalSignature and further Javadocs.
Added Busy Developers Guide and Interop guide.
Ready for release.

Index: SimpleXMLSigTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SimpleXMLSigTest.java	19 Mar 2004 22:21:51 -0000	1.12
--- SimpleXMLSigTest.java	23 Mar 2004 20:51:00 -0000	1.13
***************
*** 5,8 ****
--- 5,9 ----
  import org.dom4j.DocumentException;
  import org.dom4j.DocumentHelper;
+ import org.dom4j.Element;
  import org.neuclear.commons.crypto.CryptoException;
  import org.neuclear.commons.crypto.CryptoTools;
***************
*** 25,28 ****
--- 26,34 ----
   * $Id$
   * $Log$
+  * Revision 1.13  2004/03/23 20:51:00  pelle
+  * Added ExternalSignature and further Javadocs.
+  * Added Busy Developers Guide and Interop guide.
+  * Ready for release.
+  *
   * Revision 1.12  2004/03/19 22:21:51  pelle
   * Changes in the XMLSignature class, which is now Abstract there are currently 3 implementations for:
***************
*** 30,34 ****
   * - DataObjects - (Enveloping)
   * - Any for interop testing mainly.
!  *
   * Revision 1.11  2004/03/08 23:51:04  pelle
   * More improvements on the XMLSignature. Now uses the Transforms properly, References properly.
--- 36,40 ----
   * - DataObjects - (Enveloping)
   * - Any for interop testing mainly.
!  * <p/>
   * Revision 1.11  2004/03/08 23:51:04  pelle
   * More improvements on the XMLSignature. Now uses the Transforms properly, References properly.
***************
*** 164,167 ****
--- 170,182 ----
              XMLSignature sig = new DataObjectSignature(doc.getRootElement());
          } catch (InvalidSignatureException e) {
+ //            e.printStackTrace();
+             assertTrue("Signature Failed: " + e.getLocalizedMessage(), false);
+         }
+     }
+ 
+     private void assertValidExternalSignature(Document doc) throws XMLSecurityException {
+         try {
+             XMLSignature sig = new ExternalSignature(doc.getRootElement());
+         } catch (InvalidSignatureException e) {
              assertTrue("Signature Failed: " + e.getLocalizedMessage(), false);
          }
***************
*** 272,275 ****
--- 287,350 ----
      }
  
+     public final void testExternalSignatureUsingSigner() throws DocumentException, XMLException, CryptoException, UserCancellationException {
+         final XMLSignature sig = new ExternalSignature("neu://test", signer, "http://www.w3.org/TR/2000/WD-xml-c14n-20001011");
+         final File outputFile = new File("target/testdata/homegrown/signature-external-signer.xml");
+         XMLTools.writeFile(outputFile, sig.getElement());
+ 
+         Document doc = XMLTools.loadDocument(outputFile);
+         assertValidExternalSignature(doc);
+     }
+ 
+     public final void testExternalDSASignature() throws DocumentException, XMLException, CryptoException, UserCancellationException {
+         final XMLSignature sig = new ExternalSignature(dsa, "http://www.w3.org/TR/2000/WD-xml-c14n-20001011");
+         final File outputFile = new File("target/testdata/homegrown/signature-external-dsa.xml");
+         XMLTools.writeFile(outputFile, sig.getElement());
+ 
+         Document doc = XMLTools.loadDocument(outputFile);
+         assertValidExternalSignature(doc);
+     }
+ 
+     public final void testExternalRSASignature() throws DocumentException, XMLException, CryptoException, UserCancellationException {
+         final XMLSignature sig = new ExternalSignature(rsa, "http://www.w3.org/TR/2000/WD-xml-c14n-20001011");
+         final File outputFile = new File("target/testdata/homegrown/signature-external-rsa.xml");
+         XMLTools.writeFile(outputFile, sig.getElement());
+ 
+         Document doc = XMLTools.loadDocument(outputFile);
+         assertValidExternalSignature(doc);
+     }
+ 
+     public final void testExampleEnvelopedForOverviewDoc() throws NoSuchAlgorithmException, DocumentException, XMLSecurityException {
+         KeyPair kp = CryptoTools.createTinyRSAKeyPair();
+ 
+         Document doc = DocumentHelper.parseText("<test><test2/></test>");
+         Element elem = doc.getRootElement();
+ 
+         EnvelopedSignature envsig = new EnvelopedSignature(kp, elem);
+         System.out.println(doc.asXML());
+ 
+         try {
+             EnvelopedSignature verifid = new EnvelopedSignature(elem);
+         } catch (InvalidSignatureException e) {
+             System.err.println("Invalid Signature");
+         }
+     }
+ 
+     public final void testExampleEnvelopingForOverviewDoc() throws NoSuchAlgorithmException, DocumentException, XMLSecurityException {
+         KeyPair kp = CryptoTools.createTinyRSAKeyPair();
+ 
+         Document doc = DocumentHelper.parseText("<test><test2/></test>");
+         Element elem = doc.getRootElement();
+ 
+         DataObjectSignature datasig = new DataObjectSignature(kp, elem);
+         Element sigelem = datasig.getElement();
+         System.out.println(sigelem.asXML());
+ 
+         try {
+             DataObjectSignature verified = new DataObjectSignature(sigelem);
+         } catch (InvalidSignatureException e) {
+             System.err.println("Invalid Signature");
+         }
+     }
+ 
      private final KeyPair rsa;
      private final KeyPair dsa;

[Neuclear-develop] [JIRA] Closed: (XMLSIG-12) Update Busy Developer Guide

[<bug...@ve...>]

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Tue, 23 Mar 2004 12:48 PM

Done
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/XMLSIG-12

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: XMLSIG-12
    Summary: Update Busy Developer Guide
       Type: Task

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear XMLSig
   Fix Fors:
             0.12
   Versions:
             0.12

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Tue, 23 Mar 2004 10:37 AM
    Updated: Tue, 23 Mar 2004 12:48 PM

Description:
Create improved documentation for the XML Signatures.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira