idrs-commit Mailing List for Internet Document and Report Server (Page 3)
Brought to you by:
bigman921
You can subscribe to this list here.
| 2002 |
Jan
(113) |
Feb
(34) |
Mar
(38) |
Apr
(63) |
May
|
Jun
|
Jul
|
Aug
(40) |
Sep
(26) |
Oct
(4) |
Nov
(5) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(13) |
Feb
(15) |
Mar
(21) |
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(71) |
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: Marc B. <big...@us...> - 2004-08-29 04:50:39
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11199/src/net/sourceforge/idrs/core/servlet Modified Files: IdrsController.java Log Message: * Removed "proprietary" xml binding * Added support for JAXB * Added "fields" tag, so that if the fields are not known ahead of time, they may be iterated over * updated some copyrights Index: IdrsController.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IdrsController.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IdrsController.java 22 Aug 2004 05:17:39 -0000 1.5 --- IdrsController.java 29 Aug 2004 04:50:30 -0000 1.6 *************** *** 529,534 **** init.digestPassword() ? init.getDigestType() : "NONE", servletContext, ! null, ! null); //send content to the client --- 529,533 ---- init.digestPassword() ? init.getDigestType() : "NONE", servletContext, ! new ArrayList()); //send content to the client |
|
From: Marc B. <big...@us...> - 2004-08-29 04:50:39
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11199/src/net/sourceforge/idrs/utils Modified Files: DB.java Log Message: * Removed "proprietary" xml binding * Added support for JAXB * Added "fields" tag, so that if the fields are not known ahead of time, they may be iterated over * updated some copyrights Index: DB.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/DB.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DB.java 22 Aug 2004 05:17:39 -0000 1.16 --- DB.java 29 Aug 2004 04:50:30 -0000 1.17 *************** *** 72,75 **** --- 72,76 ---- protected transient Statement holdForClean; protected transient Object[] rows; + private String currentFieldName; public boolean hasResults() { return hasResults; *************** *** 624,627 **** --- 625,631 ---- String data = ""; + if (fieldname.equalsIgnoreCase("idrsCurrentField")) { + fieldname = this.currentFieldName; + } data = (String) fields.get(fieldname); Object mess [] = {new String(""),new String("")}; *************** *** 892,895 **** --- 896,916 ---- this.transactionType = type; } + + public Set getFieldNames() { + return this.fields.keySet(); + } + /** + * @param fieldName + */ + public void setCurrentFiledName(String fieldName) { + this.currentFieldName = fieldName; + + } + /** + * @return + */ + public String getCurrentFieldName() { + return this.currentFieldName; + } } |
Update of /cvsroot/idrs/Idrs/dev/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11199/lib Modified Files: idrs.jar Added Files: jaxb-api.jar jax-qname.jar jaxb-libs.jar relaxngDatatype.jar namespace.jar jaxb-impl.jar xsdlib.jar Log Message: * Removed "proprietary" xml binding * Added support for JAXB * Added "fields" tag, so that if the fields are not known ahead of time, they may be iterated over * updated some copyrights --- NEW FILE: jaxb-api.jar --- PK Implementation-Version: 1.0.1 Specification-Title: Java Architecture for XML Binding Specification-Version: 1.0 Implementation-Title: JAXB Reference Implementation Extension-Name: javax.xml.bind Created-By: Apache Ant 1.5 Implementation-Vendor-Id: com.sun Implementation-Vendor: Sun Microsystems, Inc. Specification-Vendor: Sun Microsystems, Inc. Name: javax/xml/bind/helpers/ParseConversionEventImpl.class SHA1-Digest: LpsTCIIDXrZFmAZ9jy29r9t64yY= Name: javax/xml/bind/Messages.class SHA1-Digest: UXXDeq6XuxOU2acgykreur0QIN4= Name: javax/xml/bind/UnmarshallerHandler.class SHA1-Digest: C1GYe2K1UUJky1LSNFdtfkBM1fw= Name: javax/xml/bind/util/JAXBResult.class SHA1-Digest: T4xBxDnDC4F2pqE4EcDcVn0+ozw= Name: javax/xml/bind/Validator.class SHA1-Digest: UFEgJMjQ+cBc9yy8oCPjgH+i4h4= Name: javax/xml/bind/helpers/AbstractUnmarshallerImpl.class SHA1-Digest: NdTrOo4biQ0IjtUxA/jOP/85LOE= Name: javax/xml/bind/ValidationEventHandler.class SHA1-Digest: YmbSlMdET9lZHMJCCGZWxA2YcQc= Name: javax/xml/bind/Unmarshaller.class SHA1-Digest: 2cM2b4nbVy3QAZx1HKcS5xrcvY4= Name: javax/xml/bind/util/JAXBSource$1.class SHA1-Digest: w6OLh7xm84fhtMvkA5uSH52Le7U= Name: javax/xml/bind/UnmarshalException.class SHA1-Digest: bnlO4GYQiekxUFISG19+46L28g8= Name: javax/xml/bind/ValidationEventLocator.class SHA1-Digest: VDm+oLTMfxJGB14G5LgYboYhaBk= Name: javax/xml/bind/helpers/NotIdentifiableEventImpl.class SHA1-Digest: yhSofzEz49kv0lZAwV27oNju8CA= Name: javax/xml/bind/util/Messages.class SHA1-Digest: 3ZndMOsHwBFVlS9JLLHKwbX83bM= Name: javax/xml/bind/helpers/Messages.class SHA1-Digest: 5O/SgypHbjMavehbND01PLFQxkg= Name: javax/xml/bind/helpers/PrintConversionEventImpl.class SHA1-Digest: iZe4AguD9x/D/s4zJaVzSpq5Zaw= Name: javax/xml/bind/PropertyException.class SHA1-Digest: zQkD8uL+3a2iyb9utV5A19f2itI= Name: javax/xml/bind/Messages.properties SHA1-Digest: lLPW3j6mYWZo1BkZqy9QxeYfwuc= Name: javax/xml/bind/util/JAXBSource.class SHA1-Digest: bupXVtbxNEUTySOkfCcnr8KmbpY= Name: javax/xml/bind/JAXBContext.class SHA1-Digest: TL2sXz8ni+1RfRSaMRR4jM1r+78= Name: javax/xml/bind/JAXBException.class SHA1-Digest: 13/vS9ihh8/TZVk8hXC8gHlGs5I= Name: javax/xml/bind/helpers/AbstractMarshallerImpl.class SHA1-Digest: 2i20i0EZdFeXVO0bHEkFhm2/qnE= Name: javax/xml/bind/PrintConversionEvent.class SHA1-Digest: lL+j6m1NNmLgcJquo1wSvi3kzP4= Name: javax/xml/bind/ValidationException.class SHA1-Digest: hNloyIaaqcp/5UXNy60W9vRr2Pw= Name: javax/xml/bind/ContextFinder.class SHA1-Digest: HBw7VzYDaGy6i/oFm9gMsDz6gOg= Name: javax/xml/bind/DatatypeConverterInterface.class SHA1-Digest: ma/3wSb2YJc5WwlWnnA+eHpmN3g= Name: javax/xml/bind/NotIdentifiableEvent.class SHA1-Digest: KxWcnlgOUOBI07x6DYUW7jv7ztE= Name: javax/xml/bind/Element.class SHA1-Digest: DmuSggLrljqAR2E0rAS2mbIr8J8= Name: javax/xml/bind/ParseConversionEvent.class SHA1-Digest: 0e8p/boXGtnkh5neZ8DEitgNOz8= Name: javax/xml/bind/ValidationEvent.class SHA1-Digest: QiAvUTztc9sDWT0EcynVwMUc9uo= Name: javax/xml/bind/helpers/DefaultValidationEventHandler.class SHA1-Digest: nD8C8tl9lpBzPYIPFlYF6Bbnxv0= Name: javax/xml/bind/util/ValidationEventCollector.class SHA1-Digest: LFqmwOqsraQtKbUIbZmcSnw9B74= Name: javax/xml/bind/helpers/Messages.properties SHA1-Digest: B2egsgXYHo8zIEVIa8bdQT4spp4= Name: javax/xml/bind/helpers/ValidationEventImpl.class SHA1-Digest: uRD6z5BIA/VERmeoemWGqMK5i5M= Name: javax/xml/bind/DatatypeConverter.class SHA1-Digest: aWb4M40qAOqAfbKI9NWu79weLNU= Name: javax/xml/bind/TypeConstraintException.class SHA1-Digest: Fe/i1r4NccUt57aAhrfa/y7juUE= Name: javax/xml/bind/MarshalException.class SHA1-Digest: iGUoLEvDsulj2yaQ149WgR18NRQ= Name: javax/xml/bind/helpers/ValidationEventLocatorImpl.class SHA1-Digest: v6tsGyeE1rikX8oF8XlJk3uRgkY= Name: javax/xml/bind/Marshaller.class SHA1-Digest: T7Bxc0xjI7qhyrk899OagbxSuIc= Name: javax/xml/bind/util/Messages.properties SHA1-Digest: +blsecQX0uEQdYzC0IR+/54Qrt0= PKdß³ Ë ¢0<0¥pºäÙ)4¶8Ê{̺¿0 *H÷ VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority0 960129000000Z 280801235959Z0_10 UUS10U VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority00 *H÷ Æ oø¬#_p)6¤Éç± ËS¥ ç=¾}þ$E3Üví¢qdLe.hE§ ó(g/|¶Åúßðè¼l,¨QÌsؤÀSðNÖ&ÀvW^!ñѱÿçÐ!XÍiãDD9\Ü VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority0 011203000000Z 111202235959Z0§10U VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA00 *H÷ ,d'0º*²º»#Å3-7§Ü´Îº9t;~¶&cp!ü9öoØ%$Diào,ç°Wþ£õÝ÷ ÷P%$_®àÖ-q7Ú1ÒZÅø0´0 ~Þv& ïùidGÚ&è0 *H÷ VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA0 040323000000Z 050421235959Z0À10 UUS10U california10U cupertino10U sun microsystems, inc1503U,Digital ID Class 3 - Netscape Object Signing10Ujavasoft10Usun microsystems, inc0"0 *H÷ ¡âq²_'±_°ÒLrÞÀÚN íO;%s£,çJWÖí¬)]¾W˲ýÍ÷ +04+(0&0$+0http://ocsp.verisign.com0U#05+ôdsm g`kÝ<»a0 `HøB0 +70 VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA~Þv& ïùidGÚ&è0*H÷ (g^㪹fP9BçnPÞ3 NQFFjzû]Zµ'AP7úæeÕòµ´\Ï}¨Ë SHA1-Digest-Manifest: mdOrXBGJ4+W7NOe0sy5zcOtlpgw= Created-By: 1.3.1_04 (Sun Microsystems Inc.) Name: javax/xml/bind/helpers/ParseConversionEventImpl.class SHA1-Digest: BR45f20J9ywxgluu3VvZprmqv20= Name: javax/xml/bind/UnmarshallerHandler.class SHA1-Digest: vbbULB8601n3U7sKqG21AjYstMI= Name: javax/xml/bind/Messages.class SHA1-Digest: kdpskY73TvmZrxsy14SM1699FgI= Name: javax/xml/bind/util/JAXBResult.class SHA1-Digest: H8g904zXhvU9NSXegiwWKE3FnzE= Name: javax/xml/bind/Validator.class SHA1-Digest: fixRvds3iNZJeEYTIEBVk4YY280= Name: javax/xml/bind/helpers/AbstractUnmarshallerImpl.class SHA1-Digest: hcPiP2WbvcJWW3tHqif38cTYeUg= Name: javax/xml/bind/ValidationEventHandler.class SHA1-Digest: zkUsh36dO8t8ZE1caMc+bNjIJlE= Name: javax/xml/bind/Unmarshaller.class SHA1-Digest: JUtQP8LpM6Z0n5hpvIfoKKaMgXI= Name: javax/xml/bind/util/JAXBSource$1.class SHA1-Digest: 3Q9NaJuufpXxGHRyQnw4+AL2SyU= Name: javax/xml/bind/UnmarshalException.class SHA1-Digest: TH+vWbDjjpDi1Su/pCJx7KofGCo= Name: javax/xml/bind/ValidationEventLocator.class SHA1-Digest: 28As9ifRjg9N0fLEaEcFzAn/2Y4= Name: javax/xml/bind/helpers/NotIdentifiableEventImpl.class SHA1-Digest: z5a5/haP9yjjJyYE6Nhuybh+tKQ= Name: javax/xml/bind/util/Messages.class SHA1-Digest: anb2L7ICj7DZaRyBvtPeN95YBnM= Name: javax/xml/bind/helpers/Messages.class SHA1-Digest: 7SCs5DkQrKytkyg61w+g4Ygn/g4= Name: javax/xml/bind/helpers/PrintConversionEventImpl.class SHA1-Digest: YE1xLXePsrMbT6rmCfRkZyDH0rY= Name: javax/xml/bind/PropertyException.class SHA1-Digest: 6xGMIH/tdNwTd4Nui/bE5HkMfzM= Name: javax/xml/bind/Messages.properties SHA1-Digest: fI3rjVVU8nHymc8ThDl5c5GcV90= Name: javax/xml/bind/util/JAXBSource.class SHA1-Digest: 3I1NRyTZ5ZGgfaCH3tKxnLlBG1M= Name: javax/xml/bind/JAXBContext.class SHA1-Digest: m1ef+f+XT+c0N0q90zwHKq5HAqA= Name: javax/xml/bind/JAXBException.class SHA1-Digest: Xm3qo16L9R4P821XLJlP9BhWvQM= Name: javax/xml/bind/helpers/AbstractMarshallerImpl.class SHA1-Digest: oFvdDJmkb8dEV1ImRRQ/at5hf/o= Name: javax/xml/bind/PrintConversionEvent.class SHA1-Digest: VSI4z6jRzAKvzucejScYUtlxPEM= Name: javax/xml/bind/ValidationException.class SHA1-Digest: wJwOaJikr6aCguJcdDKoXP8TFbo= Name: javax/xml/bind/ContextFinder.class SHA1-Digest: sxsDvu139YTn0AE8srU7mBW+ZUw= Name: javax/xml/bind/DatatypeConverterInterface.class SHA1-Digest: +M1LYqjN/zcemHyeXmNaNWjbdA0= Name: javax/xml/bind/NotIdentifiableEvent.class SHA1-Digest: 0vOmb3+oWu5QUgsqDN7qndxXbTc= Name: javax/xml/bind/Element.class SHA1-Digest: ARCgGSQpqRyzJe0EbBpdfL9YGBU= Name: javax/xml/bind/ParseConversionEvent.class SHA1-Digest: XvQKUeP+5uNGESyR02t9J7vwV1A= Name: javax/xml/bind/ValidationEvent.class SHA1-Digest: 6ygX5eniIntADHF8PcJoDqWBUzA= Name: javax/xml/bind/helpers/DefaultValidationEventHandler.class SHA1-Digest: +m9TXKixU6iipQ/rbfWPpDqOLKA= Name: javax/xml/bind/util/ValidationEventCollector.class SHA1-Digest: NvC1Z6zMAlw0YTnnHTTCnbJHzWw= Name: javax/xml/bind/helpers/Messages.properties SHA1-Digest: 33vb5aJzVVlkIWtBCZFhhMVIExU= Name: javax/xml/bind/helpers/ValidationEventImpl.class SHA1-Digest: iRqzKUPnbQj9OlWOs6r/IZJH6f8= Name: javax/xml/bind/DatatypeConverter.class SHA1-Digest: 3HBeAF3thLigsotL6CnLKSOqLIQ= Name: javax/xml/bind/TypeConstraintException.class SHA1-Digest: UYo1J6dmT58A61O/43TvXajy94M= Name: javax/xml/bind/MarshalException.class SHA1-Digest: 8LBKlidMc3v9RGlGLTdDnhe/x+U= Name: javax/xml/bind/helpers/ValidationEventLocatorImpl.class SHA1-Digest: hRgiEjG0D7SKreDV0U+QP++M5h8= Name: javax/xml/bind/Marshaller.class SHA1-Digest: RJ6/rB/V7s0VEn+hDz3e9KEicCI= Name: javax/xml/bind/util/Messages.properties SHA1-Digest: D3F5upvB5NEF+2I+XcpmCZYrV6k= PK»ªìÉ Provider {0} not found ContextFinder.CouldNotInstantiate = \ Provider {0} could not be instantiated: {1} ContextFinder.CantFindPropertiesFile = \ Unable to locate jaxb.properties for package {0} ContextFinder.CantMixProviders = \ You may not mix JAXB Providers on the context path ContextFinder.MissingProperty = \ jaxb.properties in package {0} does not contain the {1} property. PropertyException.NameValue = \ name: {0} value: {1} DatatypeConverter.ConverterMustNotBeNull = \ The DatatypeConverterInterface parameter must not be null PK¸j¶k InputStream can not be null AbstractMarshallerImpl.MustBeBoolean = \ {0} must be boolean AbstractMarshallerImpl.MustBeString = \ {0} must be a String DefaultValidationEventHandler.SeverityMessage = \ DefaultValidationEventHandler: {0} {1} \n\ \ \ \ \ \ Location: {2} DefaultValidationEventHandler.LocationUnavailable = \ unavailable DefaultValidationEventHandler.UnrecognizedSeverity = \ Unrecognized event severity field "{0}" DefaultValidationEventHandler.Warning = \ [WARNING]: DefaultValidationEventHandler.Error = \ [ERROR]: DefaultValidationEventHandler.FatalError = \ [FATAL_ERROR]: ValidationEventImpl.IllegalSeverity = \ Illegal severity Shared.MustNotBeNull = \ {0} parameter must not be null PKkNë9- Unrecognized event severity field "{0}" JAXBResult.NullContext = \ JAXBContext can not be null JAXBResult.NullUnmarshaller = \ Unmarshaller can not be null JAXBSource.NullContext = \ JAXBContext can not be null JAXBSource.NullContent = \ Content object can not be null JAXBSource.NullMarshaller = \ Marshaller can not be null PKu^8 Exceptions SourceFile getMessage jaxb.debug paramTypes ¸ SourceFile parseFloat parseQName parseShort printFloat printQName printShort ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² ² SourceFile parseFloat parseQName parseShort printFloat printQName printShort SourceFile Exceptions SourceFile - with linked exception: [ SourceFile *· SourceFile Exceptions SourceFile NAME_VALUE SourceFile getMessage SourceFile SourceFile SourceFile SourceFile - with linked exception: [ SourceFile *· SourceFile Exceptions SourceFile Exceptions SourceFile SourceFile getLocator getMessage SourceFile SourceFile SourceFile Exceptions SourceFile Exceptions SourceFile SYSYSY #SYSY&SYSY&SYSY&SYSY&SY SY'SYSY'SYSY(SYSY(SYSY)SY SY!*SY"SY#+SY$ SY%,SY&SY'-SY(SY).SY*SY+/SY, SY-/SY.SY/0SY0SY10SY2SY31SY4SY52S³± Exceptions SourceFile getMessage startsWith validating SourceFile getLocator getMessage ¶ õÊþº¾ SourceFile getMessage SourceFile *,-· SourceFile *,-· SourceFile *,-· SourceFile getLocator getMessage setLocator setMessage SourceFile lineNumber Exceptions SourceFile setHandler *´ Exceptions SourceFile access$000 access$100 marshaller Exceptions SourceFile access$000 access$100 dtdHandler fatalError getFeature getMessage setFeature SourceFile getMessage SourceFile --- NEW FILE: jax-qname.jar --- PK Specification-Title: Java API for XML Based RPC Specification-Version: 1.1 Ant-Version: Apache Ant 1.5.2 Implementation-Title: Java API for XML Based RPC Reference Implementat ion Extension-Name: javax.xml.rpc Created-By: 1.4.1_02-b06 (Sun Microsystems Inc.) Implementation-Vendor-Id: com.sun Implementation-Vendor: Sun Microsystems, Inc. Name: javax/xml/namespace/QName.class SHA1-Digest: uBV8C2GVUESwZu7A1PAcLx4Fcww= PK®m;EÐ ¢0<0¥pºäÙ)4¶8Ê{̺¿0 *H÷ VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority0 960129000000Z 280801235959Z0_10 UUS10U VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority00 *H÷ Æ oø¬#_p)6¤Éç± ËS¥ ç=¾}þ$E3Üví¢qdLe.hE§ ó(g/|¶Åúßðè¼l,¨QÌsؤÀSðNÖ&ÀvW^!ñѱÿçÐ!XÍiãDD9\Ü VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority0 011203000000Z 111202235959Z0§10U VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA00 *H÷ ,d'0º*²º»#Å3-7§Ü´Îº9t;~¶&cp!ü9öoØ%$Diào,ç°Wþ£õÝ÷ ÷P%$_®àÖ-q7Ú1ÒZÅø0´0 ~Þv& ïùidGÚ&è0 *H÷ VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA0 040323000000Z 050421235959Z0À10 UUS10U california10U cupertino10U sun microsystems, inc1503U,Digital ID Class 3 - Netscape Object Signing10Ujavasoft10Usun microsystems, inc0"0 *H÷ ¡âq²_'±_°ÒLrÞÀÚN íO;%s£,çJWÖí¬)]¾W˲ýÍ÷ +04+(0&0$+0http://ocsp.verisign.com0U#05+ôdsm g`kÝ<»a0 `HøB0 +70 VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA~Þv& ïùidGÚ&è0*H÷ ®X2H¨ï¢xçúÚ25 ±· 9u:CÓ½Ö[ñ°s{,> Ø¡-S¦&òç³!,N3"óV¿È°~ÎÚ½q&׿yw;7ªu¯üú PKPÓ%Í SHA1-Digest-Manifest: s9ZXnhtgak6L9vnQU79IIgbXl/g= Created-By: 1.3.1_04 (Sun Microsystems Inc.) Name: javax/xml/namespace/QName.class SHA1-Digest: WSdtvPxD0ICjj3xos/xk/j8pGWg= PKì|ÙÕ QName.java SourceFile +Á *+· --- NEW FILE: jaxb-libs.jar --- PK Implementation-Version: 1.0.3 Specification-Title: Java Architecture for XML Binding Specification-Version: 1.0 Ant-Version: Apache Ant 1.5.2 Implementation-Title: JAXB Reference Implementation Extension-Name: com.sun.msv Created-By: 1.4.1_02-b06 (Sun Microsystems Inc.) Implementation-Vendor-Id: com.sun Implementation-Vendor: Sun Microsystems, Inc. Specification-Vendor: Sun Microsystems, Inc. Name: com/sun/msv/reader/ChildlessState.class SHA1-Digest: xY5X0PhSn41LHmh4drmijZjyvio= Name: com/sun/msv/reader/trex/ng/NGNameState.class SHA1-Digest: kuI9tnxxYK7akIJqvsG9GqVSIm0= Name: com/sun/msv/reader/relax/core/RELAXCoreReader$StateFactory.class [...18278 lines suppressed...] --- NEW FILE: relaxngDatatype.jar --- PK Created-By: 1.4.1_02-b06 (Sun Microsystems Inc.) Ant-Version: Apache Ant 1.5.2 Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Provi derEnumeration.class SHA1-Digest: XoJPjqeahEZp7T1x6oHqs4JJ03I= Name: org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.class SHA1-Digest: aczQ/JqkgPqVTYV9l9JqXRjy3lw= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader.class SHA1-Digest: aAGzQBex7ZS6fO7YO3kmsZSQ90I= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$1.class SHA1-Digest: cfdwFFfKfUCfqBH37eiGEB4U7f0= Name: org/relaxng/datatype/DatatypeLibraryFactory.class SHA1-Digest: g/01sudPTJEBGvlXAa0yzfgC7rU= Name: org/relaxng/datatype/DatatypeBuilder.class SHA1-Digest: Kp3+xxsU4qInnq9so3+jYpuyejg= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Singl eton.class SHA1-Digest: e2VFPm0usHOi/rQ7+cENlVUC79w= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loade r2.class SHA1-Digest: 3E77Ef1RIjDPaHBMJ92uf2HjOec= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service.class SHA1-Digest: ROSgkPq4x5bdISlLSI1iWG5OAJ8= Name: org/relaxng/datatype/DatatypeStreamingValidator.class SHA1-Digest: 2RFuw5L+uOpxGR7YRxbWUn3boyk= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loade r.class SHA1-Digest: aEw8en0W7DqC+beIYLUgUFgqjfM= Name: org/relaxng/datatype/DatatypeLibrary.class SHA1-Digest: gljWy54UQTLGx7kG8fn3fDrJspk= Name: org/relaxng/datatype/DatatypeException.class SHA1-Digest: rnKrq2nPQ8MaULrYKzgiO/Jo+XI= Name: org/relaxng/datatype/ValidationContext.class SHA1-Digest: R2ykX/oS7T1zLWmVM9QzNzj4ETk= Name: org/relaxng/datatype/helpers/StreamingValidatorImpl.class SHA1-Digest: xr4/pyvivC2td/hYMtePZ/BP0Eg= Name: org/relaxng/datatype/Datatype.class SHA1-Digest: nGCxqvQJIMNLcYKqaC7kHmHk3Jk= PKó×X ¢0<0¥pºäÙ)4¶8Ê{̺¿0 *H÷ VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority0 960129000000Z 280801235959Z0_10 UUS10U VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority00 *H÷ Æ oø¬#_p)6¤Éç± ËS¥ ç=¾}þ$E3Üví¢qdLe.hE§ ó(g/|¶Åúßðè¼l,¨QÌsؤÀSðNÖ&ÀvW^!ñѱÿçÐ!XÍiãDD9\Ü VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority0 011203000000Z 111202235959Z0§10U VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA00 *H÷ ,d'0º*²º»#Å3-7§Ü´Îº9t;~¶&cp!ü9öoØ%$Diào,ç°Wþ£õÝ÷ ÷P%$_®àÖ-q7Ú1ÒZÅø0´0 ~Þv& ïùidGÚ&è0 *H÷ VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA0 040323000000Z 050421235959Z0À10 UUS10U california10U cupertino10U sun microsystems, inc1503U,Digital ID Class 3 - Netscape Object Signing10Ujavasoft10Usun microsystems, inc0"0 *H÷ ¡âq²_'±_°ÒLrÞÀÚN íO;%s£,çJWÖí¬)]¾W˲ýÍ÷ +04+(0&0$+0http://ocsp.verisign.com0U#05+ôdsm g`kÝ<»a0 `HøB0 +70 VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA~Þv& ïùidGÚ&è0*H÷ SHA1-Digest-Manifest: xVmfTyVi+VmMb8yL6wix42Wu1qY= Created-By: 1.3.1_04 (Sun Microsystems Inc.) Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Provi derEnumeration.class SHA1-Digest: slVcSkVOP2zqZRS9b0Ydh0zjP34= Name: org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.class SHA1-Digest: cOyuuv1p8A9i3dsPN5GvU4fA4IQ= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader.class SHA1-Digest: B1C26pc9jlbHHZdQ46C3mH5REZU= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$1.class SHA1-Digest: T+HMOvJJv4nc5w1pCVGR02hmPx0= Name: org/relaxng/datatype/DatatypeLibraryFactory.class SHA1-Digest: 5KSXZ1wxHKW7xN5HbI+rh2SVSVk= Name: org/relaxng/datatype/DatatypeBuilder.class SHA1-Digest: xZS9H3goclv0xIqtxtF4wkByefs= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loade r2.class SHA1-Digest: l4DZ+0yGpb4C3l8jPO59feBgsEw= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Singl eton.class SHA1-Digest: 2xlyAcMNvRp3agWgu2/RgpN8hqk= Name: org/relaxng/datatype/DatatypeStreamingValidator.class SHA1-Digest: kAsrQx4sZRtaNUkampw8/2CijrQ= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service.class SHA1-Digest: yH/ByZv200RQwnXTa2zyL0wuVKM= Name: org/relaxng/datatype/helpers/DatatypeLibraryLoader$Service$Loade r.class SHA1-Digest: sJfshNFBCxyaWxju+77sfNamr4M= Name: org/relaxng/datatype/DatatypeLibrary.class SHA1-Digest: R7BfqsTu7tQMIOyEcLvf5h8hm6s= Name: org/relaxng/datatype/ValidationContext.class SHA1-Digest: 6wrSdI/z+Ck14D/si9XhteiGPPw= Name: org/relaxng/datatype/DatatypeException.class SHA1-Digest: BpF/ePZOBI13Q1RXaVeaPdbGt50= Name: org/relaxng/datatype/helpers/StreamingValidatorImpl.class SHA1-Digest: HEAUYSUjE7/5Q9W0YB1D1aW1Zm8= Name: org/relaxng/datatype/Datatype.class SHA1-Digest: wZyXMcYpJPLGD3Czuupdl3mfFoI= PKìCÏi Exceptions ID_TYPE_ID SourceFile checkValid Exceptions SourceFile SourceFile Exceptions SourceFile SourceFile Exceptions SourceFile checkValid SourceFile getBaseUri isNotation SourceFile getMessage PK¯ SourceFile IN_COMMENT SourceFile access$000 access$100 addElement classNames isInstance openStream » PK»gì5 Exceptions SourceFile PK=¤A Exceptions SourceFile +*´ PKsëC`â SourceFile access$000 access$100 SourceFile *· PK1ý,Ð üÊþº¾ Exceptions SourceFile *· Exceptions SourceFile checkValid --- NEW FILE: namespace.jar --- PK Implementation-Version: 1.0.1 Specification-Title: Java Architecture for XML Binding Specification-Version: 1.0 Implementation-Title: JAXB Reference Implementation Extension-Name: javax.xml.namespace Created-By: Apache Ant 1.5 Implementation-Vendor-Id: com.sun Implementation-Vendor: Sun Microsystems, Inc. Specification-Vendor: Sun Microsystems, Inc. Name: javax/xml/namespace/NamespaceContext.class SHA1-Digest: ANN6xctf7vMusxlYpL5Ra9MD85E= Name: javax/xml/XMLConstants.class SHA1-Digest: VMCn8wqiAFOH0iwFqmtlYSF3Xgo= PKÔù|õ8 ¢0<0¥pºäÙ)4¶8Ê{̺¿0 *H÷ VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority0 960129000000Z 280801235959Z0_10 UUS10U VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority00 *H÷ Æ oø¬#_p)6¤Éç± ËS¥ ç=¾}þ$E3Üví¢qdLe.hE§ ó(g/|¶Åúßðè¼l,¨QÌsؤÀSðNÖ&ÀvW^!ñѱÿçÐ!XÍiãDD9\Ü VeriSign, Inc.1705U.Class 3 Public Primary Certification Authority0 011203000000Z 111202235959Z0§10U VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA00 *H÷ ,d'0º*²º»#Å3-7§Ü´Îº9t;~¶&cp!ü9öoØ%$Diào,ç°Wþ£õÝ÷ ÷P%$_®àÖ-q7Ú1ÒZÅø0´0 ~Þv& ïùidGÚ&è0 *H÷ VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA0 040323000000Z 050421235959Z0À10 UUS10U california10U cupertino10U sun microsystems, inc1503U,Digital ID Class 3 - Netscape Object Signing10Ujavasoft10Usun microsystems, inc0"0 *H÷ ¡âq²_'±_°ÒLrÞÀÚN íO;%s£,çJWÖí¬)]¾W˲ýÍ÷ +04+(0&0$+0http://ocsp.verisign.com0U#05+ôdsm g`kÝ<»a0 `HøB0 +70 VeriSign, Inc.10UVeriSign Trust Network1;09U2Terms of use at https://www.verisign.com/rpa (c)011.0,U%VeriSign Class 3 Code Signing 2001 CA~Þv& ïùidGÚ&è0*H÷ SHA1-Digest-Manifest: Mng0+927pjn/W0IkrBPCjyrAPg0= Created-By: 1.3.1_04 (Sun Microsystems Inc.) Name: javax/xml/XMLConstants.class SHA1-Digest: 1dI+618IhKeF8Xunup4p8v6bsoI= Name: javax/xml/namespace/NamespaceContext.class SHA1-Digest: 23SZztv47Kqop96xfT8l62WL1Yo= PK <º1 SourceFile XML_NS_URI SourceFile --- NEW FILE: jaxb-impl.jar --- PK Implementation-Version: 1.0.3 Specification-Title: Java Architecture for XML Binding Specification-Version: 1.0 Ant-Version: Apache Ant 1.5.2 Implementation-Title: JAXB Reference Implementation Extension-Name: com.sun.xml.bind Created-By: 1.4.1_02-b06 (Sun Microsystems Inc.) Implementation-Vendor-Id: com.sun Implementation-Vendor: Sun Microsystems, Inc. Specification-Vendor: Sun Microsystems, Inc. Name: com/sun/xml/bind/serializer/XMLSerializable.class SHA1-Digest: dnB78QRxAh6DnMCww2GxLmQ2eaE= Name: com/sun/xml/bind/unmarshaller/SAXUnmarshallerHandlerImpl.class SHA1-Digest: K2gJ7IjuT5yNM5fWi8OTUoUma+0= Name: com/sun/xml/bind/marshaller/Surrogate.class [...2680 lines suppressed...] *· ñ í --- NEW FILE: xsdlib.jar --- PK Main-Class: com.sun.msv.datatype.xsd.CommandLineTester Created-By: 1.2.2 (Sun Microsystems Inc.) Ant-Version: Apache Ant 1.5.2 Class-path: relaxngDatatype.jar Name: com/sun/msv/datatype/xsd/MinExclusiveFacet.class SHA1-Digest: 7fRCORK/b3cTh1D6D4CFTL3fvvs= Name: com/sun/msv/datatype/xsd/WhiteSpaceProcessor$Collapse.class SHA1-Digest: S05p4EOk34VT75mGZQj8p7vkfww= Name: com/sun/msv/datatype/xsd/datetime/AbstractCalendarParser.class SHA1-Digest: vKGsqwGPWWP9gc/+s8j1mVoP2iE= Name: com/sun/msv/datatype/xsd/BinaryBaseType.class SHA1-Digest: 1Y/fm4u/hjOM7MYMA9fm7PpzhGQ= Name: com/sun/msv/datatype/xsd/regex/Token$ParenToken.class [...4827 lines suppressed...] o ý} W Index: idrs.jar =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/lib/idrs.jar,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 Binary files /tmp/cvsZRzCNh and /tmp/cvsLXIojy differ |
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11199/src/net/sourceforge/idrs/core/report Modified Files: AttributeLine.java IDRSCompiler.java IDRSHead.java TagLine.java Added Files: FieldsLine.java CurrentField.java Log Message: * Removed "proprietary" xml binding * Added support for JAXB * Added "fields" tag, so that if the fields are not known ahead of time, they may be iterated over * updated some copyrights --- NEW FILE: FieldsLine.java --- /* FieldsLine.java Copyright (C) 2002 Marc Boorshtein The contents of this file are subject to the Mozilla Public License Version 1.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. */ package net.sourceforge.idrs.core.report; import java.io.Serializable; import java.util.ArrayList; import java.util.*; import org.w3c.dom.Document; import org.w3c.dom.Element; import net.sourceforge.idrs.utils.*; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class FieldsLine extends Line implements Chunk, Serializable { String tagName; private Vector vlines; private Line[] lines; private DB db; private String dbname; public FieldsLine(String dbname) { this.dbname = dbname; vlines = new Vector(); } /** * Sets the vector constaing the lines for the containor @param line Line to add */ public void addLine(Line line) { vlines.add(line); } /** * Sets the vector constaing the lines for the containor *@param lines Lines being used */ public void setLines(Vector lines) { this.vlines = lines; } /* (non-Javadoc) * @see net.sourceforge.idrs.core.report.Chunk#toString(net.sourceforge.idrs.core.report.IDRSHead) */ public String toString(IDRSHead head) throws Exception { // TODO Auto-generated method stub return ""; } /** * "Seals" the report head into static data structures from dynamic ones */ public void seal() { if (! sealed) { ArrayList llines = new ArrayList(); int i=0; for (i=0;i<vlines.size();i++) { Line l = (Line) (Line) vlines.get(i); if (l != null) { //((Line) lines[i]).seal(); } else { lines[i] = new Line(); ((Line) lines[i]).addChunk(new TextChunk("")); ((Line) lines[i]).seal(); } llines.add(l); } lines = new Line[llines.size()]; System.arraycopy(llines.toArray(),0,lines,0,lines.length); sealed = true; vlines.removeAllElements(); } } /** Public method to retrieve the information about the all of the Chunks stored in the Line @param head IDRSHead of report @param buffer Buffered output of report */ public String toString(IDRSHead head, StringBuffer buffer) throws Exception { StringBuffer tmp = new StringBuffer(500); Line line; int i; String ln; i = 0; db = head.getDB(dbname); Set fieldNames = db.getFieldNames(); Iterator it = fieldNames.iterator(); while (it.hasNext()) { String fieldName = (String) it.next(); db.setCurrentFiledName(fieldName); i=0; while (i < this.lines.length) { line = lines[i]; ln = line.toString(head,tmp); //if (ln != null) if (tmp.charAt(tmp.length()-1)!='\n') tmp.append("\n"); i++; } } i=0; tmp.deleteCharAt(tmp.length()-1); buffer.append(tmp.toString()); //return output.toString(); return null; } public void toDOM(IDRSHead head, Document doc, Element root) throws Exception { StringBuffer tmp = new StringBuffer(500); int i =0,m; Line line; String ln; //StringBuffer output = new StringBuffer(""); DB db = head.getDB(this.dbname); Set fieldNames = db.getFieldNames(); Iterator it = fieldNames.iterator(); while (it.hasNext()) { String fieldName = (String) it.next(); db.setCurrentFiledName(fieldName); i = 0; while (i < this.lines.length) { line = lines[i]; line.toDOM(head,doc,root); i++; } } i=0; } } --- NEW FILE: CurrentField.java --- /* CurrentField.java Copyright (C) 2002 Marc Boorshtein The contents of this file are subject to the Mozilla Public License Version 1.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. */ /* * Created on Aug 28, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.core.report; import java.io.Serializable; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class CurrentField implements Chunk, Serializable { String dbName; public CurrentField(String dbname) { this.dbName = dbname; } /* (non-Javadoc) * @see net.sourceforge.idrs.core.report.Chunk#toString(net.sourceforge.idrs.core.report.IDRSHead) */ public String toString(IDRSHead head) throws Exception { return head.getDB(dbName).getCurrentFieldName(); } } Index: AttributeLine.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/AttributeLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AttributeLine.java 22 Aug 2004 23:52:31 -0000 1.1 --- AttributeLine.java 29 Aug 2004 04:50:29 -0000 1.2 *************** *** 1,8 **** /* ! * Created on Aug 22, 2004 ! * ! * TODO To change the template for this generated file go to ! * Window - Preferences - Java - Code Style - Code Templates ! */ package net.sourceforge.idrs.core.report; --- 1,14 ---- /* ! AttributeLine.java ! Copyright (C) 2002 Marc Boorshtein ! ! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License); ! you may not use this file except in compliance with the License. You may obtain a copy of the ! License at http://www.mozilla.org/MPL/ ! ! Software distributed under the License is distributed on an "AS IS" basis, ! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific ! language governing rights and limitations under the License. ! */ package net.sourceforge.idrs.core.report; Index: IDRSCompiler.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSCompiler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** IDRSCompiler.java 22 Aug 2004 23:52:31 -0000 1.6 --- IDRSCompiler.java 29 Aug 2004 04:50:29 -0000 1.7 *************** *** 1128,1131 **** --- 1128,1132 ---- start = line.length(); } + else if (line.indexOf("<tag") != -1) { start = line.indexOf("\"",line.indexOf("name")) + 1; Index: IDRSHead.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** IDRSHead.java 22 Aug 2004 05:17:40 -0000 1.18 --- IDRSHead.java 29 Aug 2004 04:50:29 -0000 1.19 *************** *** 60,63 **** --- 60,64 ---- protected transient ObjectStore currStore; + private ArrayList xmlObjects; *************** *** 159,165 **** */ public void init(HashMap conns, int userNum, int docID, String url, HttpSession session, ! HttpServletRequest request,HttpServletResponse response, Application app, IDRSScriptLanguage context,UserInfo userInfo,String digest,ServletContext servcontext,Element dom,String basePackage) throws Exception { this.context = servcontext; ! this.digest = digest; --- 160,166 ---- */ public void init(HashMap conns, int userNum, int docID, String url, HttpSession session, ! HttpServletRequest request,HttpServletResponse response, Application app, IDRSScriptLanguage context,UserInfo userInfo,String digest,ServletContext servcontext,ArrayList xmlObjs) throws Exception { this.context = servcontext; ! this.xmlObjects = xmlObjs; this.digest = digest; *************** *** 223,229 **** if (obj.setProps()) obj.setProps(request); ! if (dom != null) { obj.importDOM(dom,basePackage); ! } } --- 224,230 ---- if (obj.setProps()) obj.setProps(request); ! /*if (dom != null) { obj.importDOM(dom,basePackage); ! }*/ } *************** *** 797,800 **** --- 798,805 ---- return ret; } + + public ArrayList getXMLObjects() { + return this.xmlObjects; + } } Index: TagLine.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/TagLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TagLine.java 22 Aug 2004 23:52:31 -0000 1.1 --- TagLine.java 29 Aug 2004 04:50:29 -0000 1.2 *************** *** 1,8 **** /* ! * Created on Aug 22, 2004 ! * ! * TODO To change the template for this generated file go to ! * Window - Preferences - Java - Code Style - Code Templates ! */ package net.sourceforge.idrs.core.report; --- 1,14 ---- /* ! TagLine.java ! Copyright (C) 2002 Marc Boorshtein ! ! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License); ! you may not use this file except in compliance with the License. You may obtain a copy of the ! License at http://www.mozilla.org/MPL/ ! ! Software distributed under the License is distributed on an "AS IS" basis, ! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific ! language governing rights and limitations under the License. ! */ package net.sourceforge.idrs.core.report; *************** *** 171,174 **** --- 177,182 ---- //StringBuffer output = new StringBuffer(""); + System.out.println("tagname : " + tagName); + Element element = doc.createElement(tagName); if (root == null) { |
|
From: Marc B. <big...@us...> - 2004-08-29 04:50:37
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11199/src/net/sourceforge/idrs/script Modified Files: IDRSScript.java Log Message: * Removed "proprietary" xml binding * Added support for JAXB * Added "fields" tag, so that if the fields are not known ahead of time, they may be iterated over * updated some copyrights Index: IDRSScript.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/IDRSScript.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** IDRSScript.java 19 Apr 2003 03:13:50 -0000 1.12 --- IDRSScript.java 29 Aug 2004 04:50:28 -0000 1.13 *************** *** 24,27 **** --- 24,29 ---- import net.sourceforge.idrs.core.servlet.MultiPartRequest; import java.sql.*; + import java.util.ArrayList; + import javax.ejb.*; *************** *** 155,157 **** --- 157,161 ---- public EJBObject getEJB(Connection con, String name, String home, String remote, boolean session) throws Exception; + + public ArrayList getXMLObjects(); } |
|
From: Marc B. <big...@us...> - 2004-08-22 23:52:48
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18432/src/net/sourceforge/idrs/deploy/compile/units Modified Files: Rml.java Added Files: Tag.java Attribute.java Log Message: * Added tags to handle the creation of XML tags <tag name="xmltag"> <attribute name="attribname"> . . . </attribute> . . . </tag> The tags work in text mode, but are designed for XML mode * Added the ability for an IDRS report to be generated to a DOM. This eliminates the performance loss die to parsing the resulting XML before it is added to a SOAP Body. --- NEW FILE: Tag.java --- /* * Created on Aug 22, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.deploy.compile.units; import java.util.Vector; import net.sourceforge.idrs.core.report.RepeatLine; import net.sourceforge.idrs.core.report.TagLine; import net.sourceforge.idrs.deploy.compile.CompilerState; import org.xml.sax.Attributes; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class Tag extends Body { String name; private TagLine tagLine; /** *allows for a compiler to use the attributes of the calling tag */ public void setAttributes(Attributes atts) throws Exception { this.atts = atts; name = atts.getValue("name"); this.tagLine = new TagLine(name,true); } /** *allows for the compiler to work with the current state of the page compilation */ public void setState(CompilerState state) throws Exception { this.state = state; state.sealLine(); state.pushLines(); //state.addRepeatLine(id,color1,color2); } /** *Retrieves the current repeat line */ public TagLine getTagLine() { return this.tagLine; } /** * allows for the execution of any wrap-up code at the hitting of the end tag */ public void seal() throws Exception { //if (state.getCurrentLine() != null) state.sealLine(); Vector lines = state.popLines(); //System.out.println("num lines repeat : " + lines.size()); tagLine.setLines(lines); state.setLine(tagLine); state.sealLine(); } } --- NEW FILE: Attribute.java --- /* * Created on Aug 22, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.deploy.compile.units; import java.util.Vector; import net.sourceforge.idrs.core.report.AttributeLine; import net.sourceforge.idrs.core.report.TagLine; import net.sourceforge.idrs.deploy.compile.CompilerState; import org.xml.sax.Attributes; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class Attribute extends Body { String name; private AttributeLine attribLine; /** *allows for a compiler to use the attributes of the calling tag */ public void setAttributes(Attributes atts) throws Exception { this.atts = atts; name = atts.getValue("name"); this.attribLine = new AttributeLine(name); } /** *allows for the compiler to work with the current state of the page compilation */ public void setState(CompilerState state) throws Exception { this.state = state; state.sealLine(); state.pushLines(); //state.addRepeatLine(id,color1,color2); } /** *Retrieves the current repeat line */ public AttributeLine getAttributeLine() { return this.attribLine; } /** * allows for the execution of any wrap-up code at the hitting of the end tag */ public void seal() throws Exception { //if (state.getCurrentLine() != null) state.sealLine(); Vector lines = state.popLines(); //System.out.println("num lines repeat : " + lines.size()); attribLine.setLines(lines); state.setLine(attribLine); state.sealLine(); } } Index: Rml.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Rml.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Rml.java 4 Mar 2002 23:05:35 -0000 1.2 --- Rml.java 22 Aug 2004 23:52:31 -0000 1.3 *************** *** 57,59 **** --- 57,63 ---- } + public void text(String val, Attributes atts) throws Exception { + + } + } |
|
From: Marc B. <big...@us...> - 2004-08-22 23:52:48
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18432/src/net/sourceforge/idrs/core/report Modified Files: IDRSCompiler.java Line.java IDRSRep.java PortalChunk.java RepeatLine.java IfResultsChunk.java IfChangeChunk.java IDRSBody.java Added Files: AttributeLine.java TagLine.java Log Message: * Added tags to handle the creation of XML tags <tag name="xmltag"> <attribute name="attribname"> . . . </attribute> . . . </tag> The tags work in text mode, but are designed for XML mode * Added the ability for an IDRS report to be generated to a DOM. This eliminates the performance loss die to parsing the resulting XML before it is added to a SOAP Body. --- NEW FILE: AttributeLine.java --- /* * Created on Aug 22, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.core.report; import java.io.Serializable; import java.util.Vector; import org.w3c.dom.Document; import org.w3c.dom.Element; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class AttributeLine extends Line implements Serializable, Chunk { String attribName; private Vector vlines; private Line[] lines; public AttributeLine(String name) { this.attribName = name; vlines = new Vector(); } /** * Sets the vector constaing the lines for the containor @param line Line to add */ public void addLine(Line line) { vlines.add(line); } /** * Sets the vector constaing the lines for the containor *@param lines Lines being used */ public void setLines(Vector lines) { this.vlines = lines; } /* (non-Javadoc) * @see net.sourceforge.idrs.core.report.Chunk#toString(net.sourceforge.idrs.core.report.IDRSHead) */ public String toString(IDRSHead head) throws Exception { // TODO Auto-generated method stub return ""; } /** * "Seals" the report head into static data structures from dynamic ones */ public void seal() { if (! sealed) { this.lines = new Line[vlines.size()]; int i=0; for (i=0;i<vlines.size();i++) { this.lines[i] = (Line) vlines.get(i); if (lines[i] != null) { //((Line) lines[i]).seal(); } else { lines[i] = new Line(); ((Line) lines[i]).addChunk(new TextChunk("")); ((Line) lines[i]).seal(); } } sealed = true; vlines.removeAllElements(); } } /** Public method to retrieve the information about the all of the Chunks stored in the Line @param head IDRSHead of report @param buffer Buffered output of report */ public String toString(IDRSHead head, StringBuffer buffer) throws Exception { StringBuffer tmp = new StringBuffer(500); int i =0; Line line; String ln; //StringBuffer output = new StringBuffer(""); buffer.append(' ').append(this.attribName).append("=\""); while (i < this.lines.length) { line = lines[i]; ln = line.toString(head,tmp); if (ln != null) { ln = ln.replaceAll("\n",""); tmp.append(ln); } i++; } i=0; if (tmp.charAt(tmp.length()-1) == ' ') tmp.deleteCharAt(tmp.length()-1); buffer.append(tmp.toString().trim()); buffer.append("\""); //return output.toString(); return null; } /* (non-Javadoc) * @see net.sourceforge.idrs.core.report.Line#toDOM(net.sourceforge.idrs.core.report.IDRSHead, org.w3c.dom.Document, org.w3c.dom.Element) */ public void toDOM(IDRSHead head, Document doc, Element root) throws Exception { StringBuffer tmp = new StringBuffer(500); int i =0; Line line; String ln; while (i < this.lines.length) { line = lines[i]; ln = line.toString(head,tmp); if (ln != null) { ln = ln.replaceAll("\n",""); tmp.append(ln); } i++; } if (tmp.charAt(tmp.length()-1) == ' ') tmp.deleteCharAt(tmp.length()-1); root.setAttribute(this.attribName,tmp.toString().trim()); } } --- NEW FILE: TagLine.java --- /* * Created on Aug 22, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.core.report; import java.io.Serializable; import java.util.ArrayList; import java.util.Vector; import org.w3c.dom.Document; import org.w3c.dom.Element; import net.sourceforge.idrs.utils.DB; /** * @author mlb * *Respnonsable for generating XML tags */ public class TagLine extends Line implements Chunk, Serializable { String tagName; private Vector vlines; private Line[] lines; private AttributeLine[] attribs; boolean trim; public TagLine(String name,boolean trim) { this.tagName = name; vlines = new Vector(); this.trim = trim; } /** * Sets the vector constaing the lines for the containor @param line Line to add */ public void addLine(Line line) { vlines.add(line); } /** * Sets the vector constaing the lines for the containor *@param lines Lines being used */ public void setLines(Vector lines) { this.vlines = lines; } /* (non-Javadoc) * @see net.sourceforge.idrs.core.report.Chunk#toString(net.sourceforge.idrs.core.report.IDRSHead) */ public String toString(IDRSHead head) throws Exception { // TODO Auto-generated method stub return ""; } /** * "Seals" the report head into static data structures from dynamic ones */ public void seal() { if (! sealed) { ArrayList llines = new ArrayList(); ArrayList lattribs = new ArrayList(); int i=0; for (i=0;i<vlines.size();i++) { Line l = (Line) (Line) vlines.get(i); if (l != null) { //((Line) lines[i]).seal(); } else { lines[i] = new Line(); ((Line) lines[i]).addChunk(new TextChunk("")); ((Line) lines[i]).seal(); } if (l instanceof AttributeLine) { lattribs.add(l); } else { llines.add(l); } } lines = new Line[llines.size()]; System.arraycopy(llines.toArray(),0,lines,0,lines.length); attribs = new AttributeLine[lattribs.size()]; System.arraycopy(lattribs.toArray(),0,attribs,0,attribs.length); sealed = true; vlines.removeAllElements(); } } /** Public method to retrieve the information about the all of the Chunks stored in the Line @param head IDRSHead of report @param buffer Buffered output of report */ public String toString(IDRSHead head, StringBuffer buffer) throws Exception { StringBuffer tmp = new StringBuffer(500); int i =0,m; Line line; String ln; //StringBuffer output = new StringBuffer(""); buffer.append('<').append(this.tagName).append(' '); for (i=0,m=attribs.length;i<m;i++) { attribs[i].toString(head,buffer); } buffer.append(">\n"); i = 0; while (i < this.lines.length) { line = lines[i]; ln = line.toString(head,tmp); //if (ln != null) if (tmp.charAt(tmp.length()-1)!='\n') tmp.append("\n"); i++; } i=0; tmp.deleteCharAt(tmp.length()-1); if (trim) { buffer.append(tmp.toString().trim()); } else { buffer.append(tmp); } buffer.append("</").append(this.tagName).append(">\n"); //return output.toString(); return null; } /* (non-Javadoc) * @see net.sourceforge.idrs.core.report.Line#toDOM(net.sourceforge.idrs.core.report.IDRSHead, org.w3c.dom.Document, org.w3c.dom.Element) */ public void toDOM(IDRSHead head, Document doc, Element root) throws Exception { StringBuffer tmp = new StringBuffer(500); int i =0,m; Line line; String ln; //StringBuffer output = new StringBuffer(""); Element element = doc.createElement(tagName); if (root == null) { doc.appendChild(element); } else { root.appendChild(element); } for (i=0,m=attribs.length;i<m;i++) { attribs[i].toDOM(head,doc,element); } i = 0; while (i < this.lines.length) { line = lines[i]; line.toDOM(head,doc,element); i++; } i=0; } } Index: IDRSCompiler.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSCompiler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IDRSCompiler.java 18 Jan 2002 15:26:17 -0000 1.5 --- IDRSCompiler.java 22 Aug 2004 23:52:31 -0000 1.6 *************** *** 81,84 **** --- 81,85 ---- PrintWriter logOutw; PrintStream logOuts; + private String tagName; *************** *** 928,931 **** --- 929,935 ---- ObjectChunk objChunk; RepeatLine repLine; + TagLine tagLine; + String tagName; + String attribname; Vector tmpVec; String dbname; *************** *** 933,936 **** --- 937,943 ---- Line tmpLn; IfResultsChunk ifrs; + AttributeLine attribLine; + + boolean trim; if (start < line.length()) { //TODO:Create an ObjectChunk with a given varlist, methodName, and objName *************** *** 1121,1125 **** start = line.length(); } ! /* We're ignoring this for now --- 1128,1181 ---- start = line.length(); } ! else if (line.indexOf("<tag") != -1) { ! start = line.indexOf("\"",line.indexOf("name")) + 1; ! end = line.indexOf("\"",start + 1) ; ! ! ! ! ! ! tagName = useLine.substring(start,end); ! ! if (line.indexOf("trim",end) != 1) { ! start = line.indexOf("\"",line.indexOf("trim")) + 1; ! end = line.indexOf("\"",start + 1) ; ! trim = useLine.substring(start,end).equals("true"); ! } else { ! trim = true; ! } ! ! tagLine = new TagLine(tagName,trim); ! currentLine = tagLine; ! Vector lines = new Vector(); ! useLine = getLine(); ! line = useLine.toLowerCase(); ! while (line.indexOf("</tag>") == -1) { ! tagLine.addLine(procLine(useLine,0,null,repLn)); ! ! useLine = getLine(); ! line = useLine.toLowerCase(); ! } ! tagLine.seal(); ! start = line.length(); ! } ! else if (line.indexOf("<attribute") != -1) { ! start = line.indexOf("\"",line.indexOf("name")) + 1; ! end = line.indexOf("\"",start + 1) ; ! attribname = useLine.substring(start,end); ! attribLine = new AttributeLine(attribname); ! currentLine = attribLine; ! Vector lines = new Vector(); ! useLine = getLine(); ! line = useLine.toLowerCase(); ! while (line.indexOf("</attribute>") == -1) { ! attribLine.addLine(procLine(useLine,0,null,repLn)); ! ! useLine = getLine(); ! line = useLine.toLowerCase(); ! } ! attribLine.seal(); ! start = line.length(); ! } /* We're ignoring this for now *************** *** 1171,1175 **** } else { ! currentLine = createLine(currentLine); currentLine.addChunk(new TextChunk(useLine.substring(start))); --- 1227,1231 ---- } else { ! currentLine = createLine(currentLine); currentLine.addChunk(new TextChunk(useLine.substring(start))); Index: Line.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/Line.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Line.java 6 Feb 2003 20:13:45 -0000 1.6 --- Line.java 22 Aug 2004 23:52:31 -0000 1.7 *************** *** 16,19 **** --- 16,28 ---- import java.util.*; + import javax.xml.parsers.DocumentBuilder; + import javax.xml.parsers.DocumentBuilderFactory; + + import org.apache.crimson.tree.TextNode; + import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl; + import org.w3c.dom.Document; + import org.w3c.dom.Element; + import org.w3c.dom.Text; + /** Line<br> *************** *** 76,79 **** --- 85,113 ---- } } + + public void toDOM(IDRSHead head,Document doc,Element root) throws Exception { + // StringBuffer vals = new StringBuffer(""); + + if (root == null) { + return; + } + Chunk ch; + //System.out.println("Number of chunks : " + chunks.length); + StringBuffer buff = new StringBuffer(500); + for (int i=0; i<chunks.length;i++) { + ch = chunks[i]; + String text = ch.toString(head).trim(); + if (text.length() != 0) { + buff.append(text); + } + + } + + if (buff.length() != 0) { + Text txt = doc.createTextNode(buff.toString()); + root.appendChild(txt); + } + } + /** Index: IDRSRep.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSRep.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IDRSRep.java 14 Sep 2001 23:46:42 -0000 1.3 --- IDRSRep.java 22 Aug 2004 23:52:31 -0000 1.4 *************** *** 15,18 **** --- 15,20 ---- import java.io.*; + import org.w3c.dom.Document; + /** IDRSRep<br> *************** *** 71,75 **** --- 73,85 ---- return e.toString(); } + + } + + public Document buildDDMReport() throws Exception { + + return body.toDOM(head); + + } /** Index: PortalChunk.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/PortalChunk.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PortalChunk.java 22 Nov 2002 07:16:24 -0000 1.1 --- PortalChunk.java 22 Aug 2004 23:52:31 -0000 1.2 *************** *** 14,17 **** --- 14,21 ---- import java.io.Serializable; import java.util.*; + + import org.w3c.dom.Document; + import org.w3c.dom.Element; + import net.sourceforge.idrs.utils.*; import net.sourceforge.idrs.core.report.*; *************** *** 68,72 **** --- 72,109 ---- return ""; } + + + + + /* (non-Javadoc) + * @see net.sourceforge.idrs.core.report.Line#toDOM(net.sourceforge.idrs.core.report.IDRSHead, org.w3c.dom.Document, org.w3c.dom.Element) + */ + public void toDOM(IDRSHead head, Document doc, Element root) + throws Exception { + UserInfo user = head.getUserInfo(); + + boolean ok = false; + + + for (int i=0,m=groups.length;i<m;i++) { + if (user.inGroup(groups[i])) { + ok = true; + break; + } + } + + + + if (ok) { + + for (int i=0,m=lines.length;i<m;i++) { + + + lines[i].toDOM(head,doc,root); + } + //buff.append(super.toString(head)); + } + } public void setLines(Vector lines) { Index: RepeatLine.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/RepeatLine.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RepeatLine.java 21 Sep 2002 16:13:03 -0000 1.6 --- RepeatLine.java 22 Aug 2004 23:52:31 -0000 1.7 *************** *** 17,20 **** --- 17,24 ---- import java.util.*; import java.io.*; + + import org.w3c.dom.Document; + import org.w3c.dom.Element; + import net.sourceforge.idrs.utils.*; *************** *** 91,95 **** lineNum++; } ! buffer.deleteCharAt(buffer.length()-1); lineNum=0; --- 95,99 ---- lineNum++; } ! if (buffer.charAt(buffer.length()-1) == ' ') buffer.deleteCharAt(buffer.length()-1); lineNum=0; *************** *** 100,103 **** --- 104,134 ---- + /* (non-Javadoc) + * @see net.sourceforge.idrs.core.report.Line#toDOM(net.sourceforge.idrs.core.report.IDRSHead, org.w3c.dom.Document, org.w3c.dom.Element) + */ + public void toDOM(IDRSHead head, Document doc, Element root) + throws Exception { + DB db = head.getDB(id); + lineNum = 0; + int i =0; + Line line; + String ln; + //StringBuffer output = new StringBuffer(""); + while (db.next()) { + while (i < this.lines.length) { + line = lines[i]; + + line.toDOM(head,doc,root); + + + i++; + } + + i=0; + lineNum++; + } + + lineNum=0; + } /** Wether or not the set should has another results Index: IfResultsChunk.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IfResultsChunk.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IfResultsChunk.java 6 Feb 2003 20:13:44 -0000 1.5 --- IfResultsChunk.java 22 Aug 2004 23:52:31 -0000 1.6 *************** *** 16,19 **** --- 16,23 ---- import java.io.*; import java.util.*; + + import org.w3c.dom.Document; + import org.w3c.dom.Element; + import net.sourceforge.idrs.utils.*; *************** *** 137,141 **** } ! buffer.deleteCharAt(buffer.length()-1); --- 141,145 ---- } ! if (buffer.charAt(buffer.length()-1) == ' ') buffer.deleteCharAt(buffer.length()-1); *************** *** 144,147 **** --- 148,188 ---- } + + + + /* (non-Javadoc) + * @see net.sourceforge.idrs.core.report.Line#toDOM(net.sourceforge.idrs.core.report.IDRSHead, org.w3c.dom.Document, org.w3c.dom.Element) + */ + public void toDOM(IDRSHead head, Document doc, Element root) + throws Exception { + DB db = head.getDB(dbname); + + int i =0; + Line line; + String ln; + + if (db.hasResults()) { + while (i < this.elines.length) { + line = elines[i]; + + line.toDOM(head,doc,root); + + + i++; + } + } + else { + while (i < this.dlines.length) { + line = dlines[i]; + + line.toDOM(head,doc,root); + + + i++; + } + } + + + } /** Does nothing, fulfills Chunk interface Index: IfChangeChunk.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IfChangeChunk.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IfChangeChunk.java 4 Mar 2002 23:05:34 -0000 1.4 --- IfChangeChunk.java 22 Aug 2004 23:52:31 -0000 1.5 *************** *** 18,21 **** --- 18,24 ---- import java.io.*; + import org.w3c.dom.Document; + import org.w3c.dom.Element; + /** *************** *** 99,102 **** --- 102,141 ---- } + + + + /* (non-Javadoc) + * @see net.sourceforge.idrs.core.report.Line#toDOM(net.sourceforge.idrs.core.report.IDRSHead, org.w3c.dom.Document, org.w3c.dom.Element) + */ + public void toDOM(IDRSHead head, Document doc, Element root) + throws Exception { + Line line; + //StringBuffer output = new StringBuffer(""); + + //first we'll check if the value has been initiated + DB data = head.getDB(db); + String dataVal = data.getFieldData(field,null); + + boolean run = false; + + + run = ((! dataVal.equalsIgnoreCase(current)) || (current == null)); + + + //we'll update current regardless + current = dataVal; + + //loop throuhg all of the lines and retrieve the lines of data + if (run) { + int i =0; + while (i < lines.length) { + line = lines[i]; + //buffer.append( line.toString(head) ); + line.toDOM(head,doc,root); + i++; + } + } + + } /** "Seals" the report head into static data structures from dynamic ones Index: IDRSBody.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSBody.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** IDRSBody.java 21 Sep 2002 16:13:03 -0000 1.7 --- IDRSBody.java 22 Aug 2004 23:52:31 -0000 1.8 *************** *** 16,19 **** --- 16,25 ---- import java.util.*; + import javax.xml.parsers.DocumentBuilder; + import javax.xml.parsers.DocumentBuilderFactory; + + import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl; + import org.w3c.dom.Document; + /** * IDRSBody<br> *************** *** 102,105 **** --- 108,146 ---- } + public Document toDOM(IDRSHead head) throws Exception { + prepBody(); + buffer = new StringBuffer(); + head.setPrintTarget(buffer); + int i = 0; + String output = head.getText(this); + Line ln; + // System.out.println("lines : " + lines.length) + DocumentBuilderFactory factory = new DocumentBuilderFactoryImpl();//DocumentBuilderFactory.newInstance(); + factory.setNamespaceAware(true); + + DocumentBuilder builder = factory.newDocumentBuilder(); + + Document doc = builder.newDocument(); + for (i=0; i< lines.length; i++) { + ln = lines[i]; + if (ln == null) { + //output += "\n"; + + + } + else { + //output += ln.toString(head) + "\n"; + //ln.toString(head,buffer); + ln.toDOM(head,doc,null); + + + } + } + + + return doc; + + } + /** * Defines wether or not a report is HTML |
|
From: Marc B. <big...@us...> - 2004-08-22 23:52:48
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18432/src/net/sourceforge/idrs/axis Modified Files: IdrsProvider.java Log Message: * Added tags to handle the creation of XML tags <tag name="xmltag"> <attribute name="attribname"> . . . </attribute> . . . </tag> The tags work in text mode, but are designed for XML mode * Added the ability for an IDRS report to be generated to a DOM. This eliminates the performance loss die to parsing the resulting XML before it is added to a SOAP Body. Index: IdrsProvider.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis/IdrsProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IdrsProvider.java 22 Aug 2004 05:17:41 -0000 1.1 --- IdrsProvider.java 22 Aug 2004 23:52:32 -0000 1.2 *************** *** 78,82 **** } ! IdrsResourceMgr mgr = (IdrsResourceMgr) msgContext.getProperty(IdrsHandler.IDRS_RESOURCES); HashMap dbs = new HashMap(); --- 78,82 ---- } ! Document doc = null; IdrsResourceMgr mgr = (IdrsResourceMgr) msgContext.getProperty(IdrsHandler.IDRS_RESOURCES); HashMap dbs = new HashMap(); *************** *** 103,106 **** --- 103,107 ---- Document bodyDoc = null; + try { bodyDoc = bodypart.getAsDocument(); *************** *** 129,133 **** report.getHead().setSendToClient(true); ! buffer = report.buildReport(); } catch (Throwable e1) { --- 130,137 ---- report.getHead().setSendToClient(true); ! /*buffer = report.buildReport(); ! System.out.println(buffer);*/ ! doc = report.buildDDMReport(); ! } catch (Throwable e1) { *************** *** 159,167 **** ! if (buffer == null) throw new AxisFault("No report content"); System.out.println("buffer :\n" + buffer); ! DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder domBuilder = null; Document doc = null; --- 163,171 ---- ! /*if (buffer == null) throw new AxisFault("No report content"); System.out.println("buffer :\n" + buffer); ! /*DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder domBuilder = null; Document doc = null; *************** *** 174,178 **** e.printStackTrace(System.out); ! } --- 178,182 ---- e.printStackTrace(System.out); ! }*/ |
|
From: Marc B. <big...@us...> - 2004-08-22 05:18:23
|
Update of /cvsroot/idrs/Idrs/dev/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/lib Modified Files: idrs.jar Added Files: saaj.jar axis.jar jaxrpc.jar jboss-j2ee.jar Log Message: First pass at integration with Axis --- NEW FILE: saaj.jar --- PK ¬¨UÖx%ëqx ýk¦mòuÑ|a@lÓ©3Éi³íF¹{´f¡&UqjíS×û@ã¦G`¢rDOiSo6,Ýsè±^â fó]êòUñÆ«æ7æ)Pß5 vÌMÇöâP" £î¦csôÁc4¿Ü¤ó¯[Ô>ÐwjGÌHÕë°Éå¯thªÜ5íUQà¢ßRN·¨]·K`2À7ujpó¤ô5ä |¦ò½]D ]C¹®"H@bÿF¾ÈRmè½ÒJ?Pî}=Æ~jÞ0¼¼ì£mFó$ÑÆµø^(þ ѹ»å²sÊ> ¶Åh]ô*ÝR,«ÅXH§YN¸´/ ïfOy´^ïôÆÂye/îé^æÌ¥Ü +¦Ü8DÚB^fÈB¶[ÊQ«Îk°÷¦¬«#4/hvAÿçÊu æ`»~¡ißv¡÷¢OÜë9¥ ñKu§´{9º±)ü#Q@ü2@DrøÄ ìý ä." á·ßW~~µA ±a5)ÔÅP &8qlèdnû'cp'trÆqÂý O;rx69h¥øâÅèÂ9»L+ î@R'i$HQ?Ål˱"VªÂLúMÉð±øiÄÏ >øÂ ø2|_Oü"â¿øða:Ào@Ô·R°9Åsèo_*ô¤Ô4% Õ#ñi9-&£í#ísZ> d´>4£mVÐð9&Êãà)á°ø§ÁO¹ ý8 å73e&#㯹ðü(1cA¥t çÞ|~½ û¼/EÊ*$ªÆÉf7;ëÌ,$U¼à½µ*Z¼wÛØj[»IÉ©~ð<Ç/~ò/ð_úxü=3³Ën² ÉÉ;ïû¼Ïå÷>Ïowòõç>Ð9×`DÇ}0u"+³1q:Th8$O[ÃayÞ¯#I yY;: x@WÇ2Ùöàë¸EG4mÂZLiÖðê\=$Ã1ëXGT<ª#)xL$Çeækx\ Ö÷6S©©É\ÊsÌB*cf}ÇÎØù1ËÝ¡ 9oÝ÷|3¥Õ í~*gæ'R¾kç'vTIvåLÏësL1í¨ï=le}z[>ºÌÉ Zêpwuà%ïøãNÇÊZßvò 6,Tpüèì.ëк©Ê`UAµ^Y0±q&MÁ¶Kç(ÔMÏè8û\§`¹þt¡¶1kÜ,æü̢ܵxV¶èÚþtÔuÕ±¢íjÈ Ð¹my;g ]H±,´µlID¾'_(ú 5g±ÌIÉçL{¨Xôí\j_E.Z[ÈÓè¬û-Ï)ºB®f[|zÏJÊ®6Ô²Ñâø¸åZc\ìXSQ¼9ÚÙoEô¸p+ALpÒÖ÷×â:/øNªxÅÀ«8iàz¼¦ ùS|QpÅipïÎ}UÛ«2 Ë3EGlHxogM5p §×äF2j2ëscɨ´7Õ·MßKßRñ¶wð®÷ð¾ücÝ `í%¨Bd²Û{È´Ìà&ö=ÊÂ6§&{«nTCà~hàïø{ÆÎG VÖãñOÿÂu¬Rÿî¡={2)ÏrØYËKø7ÎøgÊ9]TxRµuÊ{wez¶ Oe8kà3VÀ6ÿ%Ì*XZ©È¸ã&Ù´Y3%8(Ëâb×°ßí k5Þå¸áÛ·©NÇè¨ÓÏVÕm,4ÊÈëÊöº%n ïþXÕ䤿;¡d¡çJ«î¼t»:ä:GåÊÙ!wTMôÜ%¢/¯ñò8¤©kåýòºU(TMXþ.'ï[S~Mªí[¹Lª¢ N{¾Å&ÔL7åf¬`óÏÊ´MÏ*®IJI=#¦"nMÙï·÷A¶òöÚÞÜèRW6¸öºP4³9Ç#Äb.·ÓÞ`ÔH;.zQs]A?=tÖPÿ\+.(G}X¤ÔE¾LjÓQ+n=P4sÞdùqKWóN~øÇ6 ¿æ,Å'_]4vÎBù%ØÆ1÷`;G#T@;øÔ¥ïQK¿E¿ÀH×WhîÃþ4uuÐÐß]BìLÿ<âÃóPg¡µ6 sKomæPÑ=¥_ÔÕ¸CO Ë©Õ#Z¬FAÈs;¿ C(p7AÜC#håw`ƨ1@¿&°Á¸)8û~<N=Ü]ô²·à·ØÍY᪷R3F84¦à¶ð°KÞ ÖP¶Í¡¥Ä¾: t0R+9Ð5ît£¸ïI¡zñóXÙJÄKøÕÐñ(&XùÕ5ÜR®áÖ0´"é Lª¨ïÿ5ØNV²§¸>«ÄRÕãd+ð0u¡ö£Ô~ëð®ÄÓ¸ ÏÒê9Ü `âl¼/ãNRëî¾Fé)oâmþå]Â8Ç;ûK|¯ñ¾áýø/Áïyþ?à3¥×ÖRüWiÁ9e+þ°çc´H½q{ÈÎú8ãµ£l x´ÍXqf ËÐÅ¿~p¼:{IíÃÌØAòòÿ¿ÂdÕ TlU¦îÀßY<I{±-ÑÇï0LÛï°ñ{Ú~O[±+:5î¦E¬µ ßyïýPKÊÓ î·¢S 04ëæ®¥=þ'Ln)»îCßB:\_ZÛZNçrÉ'éL2µ]Ýd× scX·§lËõ¸åmp³,úÏm¬fWÒ«k5,Ã#ñhl!²w( cɰÄórq[8k|ÛRÇÖ¹¹ÁC«Î·k¸#~ûý¢pm^J,×åáºg;¯)¡6K¼ZôSÒ)l4ûoD«Ø×EÉ3lá|Méc7aÔ%Ñ®;{¢JÄ0\/Ë&Wª÷Ö%aÅSÁwãÎT$ ;±hÊuVðâÌ?L3fu³ÚP5g]dÙ©îÓÆ%>ô3ùqâKÎøi$Ãíâ¼Äõ]çûÛµX, f4Ìâá1ãßKÉ4h'Ã`Új®{ÏÎÙ|9Ãĺ%§!âÙÊ'+z|E0·dhÃ# Ô0/>¤4t!ÌÐù?»½'tï8Où ²ÿȳZVưvd:<SÑú?F½'¶tV#ÈK%!9&pÄê\>Èq,ïdüz¢õHÂ<»bÓT7bßÒsÐI/J3=Ô²ÐP ¦¡.KI HÀÆÚì5ìnJ*ñ!Qñjà)*`$.UZ Íe)0T²Y^m,I÷µT*fŪ/X®øHPI¤Lf^ìTmGº ºåyªÊÃ;$9ÕëêoP_êß»½3M ÍQ@«Y^õ Ä3Y áLsi Ýre£y]º²3¶cûgevêÞ£YTî1%%®Õ*3o®º9k«~¤»¼(_£xÌàÚM ìÙ6DZÇÀvCYÃ%¯á²C8l`{ L`ÒÀ41pTãØ§áuó¸¢áªÂ´rÿ£Ç̵wúñÃʾV¥_æ®ö®LgWÓ½2ä«VÝ+V¦+GçÝ}ÕÆ¶O͵*éqͧ¹èÓ;Î*ÛõÌXM°Fé^Àh&»ÕÄ$ßõ0øDL_^@9r¤Ãªÿ´ÝõSöùäþâw$NZÛÀ¢ùÄï ÜE¼D&qiä-hb\+~fsèSÊñ£ÐÖÑ·#4˵>q¥»óÝ¿pÉ\+íXðhyäy <¯2úÒx¿ )¼,ÞÅI¼TPÀ2ÎSv+´x´¿& çd7}&Mã"2ôx Ça"Ç(B-dTg9à^ê>LóWèm¤{ZõÅowr°× áðqÏý£xB=»A¯élH)Îâ71pýJÔê*~?¡Oy~FàÏ9Ì/8Ê/9°ÎWAÀÑ4 hÐ6Ïqòë¡VúDÀzØdCàçN=ðÿ)|ÓUá/óXò-¤lÊ#f®As_IóP 3÷6nCü=Ê-¾'ômöê¦þ#Kú)cP0Ñö©Ûqîe,¸=Ëóþ\ù<§¦RlÄ,þPK½Ø»ÅÉ J\(t% Dd³G«5kìK1+J BDÜ f± ü÷°ËG{LaÁ»nÖÁµWP÷á³Ç=ô¹{À / ¦b}ðÀïêh}?¾A=¾¥_¬Çtöúi?1'ÀO¸q¿ñ'é×b´ãçR=pXrKiBSîíÄ_/PþÀa!áEôZ³åËÑî¸1Ê$Ö´e ÷P¿ÐTSã*¾r÷ ËçY56 6CB¢ã>vòÛ5x§ÌóUlåªÛ"¯Ñ2fúè¨ù®@¡È6Ð#zZÊ ¿ÑîwªØhÃ_Ø ¿)³è}øCøxKTÄtWd,1/Þcþ vî8ìܱÙáRI.ú»Mü%vÂÈ< ~ÌäÉCÇJìàO½7v&ÉÞ2zk²´½ÄPÌbG¸¾Öw gÍÂϾ_wImôp}{°¨ga´²Nìb{píE/Ûa¶Xi:»Æz ±èºCn°gíöèÂi"ÐKS"`ÇmÞ§¾ýî¡eDya+»Nn æ1UxØÅÂN}içA±~£hd³ADhßÇfÐÝ'è~;hõ*Õ F´òr^>úòÔüÓíeAúÂÇNVL½ßú$NØ×c´§ÓËÏÙ¹ªö/aض?A¤/Ô¡}ª;&¬bÇF«&D¥æ$YGØÓùH-0w°¹MÁüx ^ ·3óðÌ6À U'MWM(Nk:ÅzrÛiTvÿPKYѶ{¿ @ Ï5Ó4ZD½8è=¤?i22jkë¡´¨h îÃýs?ß×@À ïbNrÑÆuÊÕ°\ã?9S¼ÊYÒ6²Ê7P[§+IqLOÈdOpt¾w?©»&[©aÄÈ´=ëKÅ5¿³¡#ü¿:\¶`Ám&°u LG:#]CmÎô¶àý JéÂÎìþöýüzÿ eÒ \« QoòNæ¹Ê°~´H§Á(qmØß$'ø×e"ÕÜÃ!ÁI´ÉÙ?6Ë,7ªòØýkfPulÂC8ÙhÐþop¼¦dåÂ>Cÿ¶Z¨ÁÑå[À8;ço W>4àqtkx-Ͷá6a§&»ÌlÎ{LZu»áÝ®;íPKÖJU 3à8cº*£);-ÏK^p¼kAºÔÐ0QéPO'=]êé]tÇkèÜåæÐyÛò/!¯î¹M/4¼Ä«cý+:Ä0Ü¥']Ï·z]x [¾àdà$;MLÊȤy7Yï$^HjÇk XÔ°$,SïO]a= 6l¿åºmÃT}tÉeoËâ"uÚ0̧.ûE$]<_ ½â(w]!5æºh¤/@®ÈÑhàð}Þ ÑI]d'8= j7õjd }ô èÇmLKD$<Ë$z½ßù¾¯ï¡l"¶yþºxf}àÚ¯¯"N:T²@ã$»¸C0ÖÒC«d¾4Ü£Sɼ =÷çÿPKñÌ\¡ wÏ·®tRô§Í³;~Ï#+êI+ôyß:ç=qÔÈ¢ãˤé¡ÜlÑW®ï L!%¹×µZ*p½î4O-3\?dfÚ9SÒçSÉãk©sßK+Rí¥Íb»gphãΰÏmñEØ<~+]¡F7\Hµ1é!ÿ'ËPû¥QkfR9P®´N -? Ú Õ¦øzuʰ7ö"ddêéÖË@|s£XjàdËø5sNèÙI<=ÿ^¤ÌݳfasX\lÙjÑÐí¡é· æû0Ñɬ?Õ¶ñlß!Æú.Å¡V¦´n:WnùÀ'n\SM]ý¸Vq¨þáEçNØÕ²é{»UÄò÷¥_``£ß#úÂÔJ%ÌS¶@Y¢¡Ç9äI)çŲãyåRÉ1W±B Ã3Ôt¬cUǵ$_Çϱ©ãlé¸ocGÇxa~71ìÒÿÞþPKItµÙ 6 èÁKÎ*vçð§,ªwD\ þæW ¡ÍäÆ`lÜwPÍç¹Npªé¬ÿ6Ñ·^ñBAÍPoº#õäÓjN-nDßÇ0=*!zè½$ 4êÍô'ËC£=N~ç+Y\'Ù/É|Ø¡÷g7Èêu¼Ñ ÑïÉ_0\¦ýÏdÞ ÒOÀ(©00î£QÆm{^ G }µh£ úF Ç\tV|4môÔt-µðO6<ê¸UàA.´qÒ<¶!Í[P¢»u¾µWwÿÁNÑz²uùàÁS(¡¶2Ú£etÐPFç)®ý¶ýÅÿäæ%ÛÑ>ÓÌ;7 <jÄ$¦ÈªîÁ´-gûPKü}a½ê ¢ÈFp&³ ºEx.ó¡¢Q«rüccÓÈY]Ê-o¸ÎScÍâ³á9Ó6½Ë]ì CpÁY§êxÞ´ùZy»Ë¢!wµb¸¦ÈådÐÛ0«£>{+·U¶rUǨä óKW¶¼âM"6õçviV¨ ]nT[Ь3hº:B 3.)%îÝäÕªQ¢-÷g²´#Ju ·öUµûvɪ©C4iU NÍ-ò«¦ïç>fDúTÁQSq§"¸ â"ÆTba¬E¾nY¼dXÏðxCç[0ì´r6¹ëë<%¯â@ã¼[ª¹íµõ¸õhZtb"e;^ªÂݲéy|ÿwË}-γM/ÈjÏiXqzÑqzëqr"ôí§læVÓØGÞSÀ "Em+¶(^åÒÎ0ËÐÒp K Ó&4Õú¯ÐpdF}öG9MÔ¦<ø²'çÛïÜOö×ïoßı¤¢àJzBÁ¤§ )RwÏ¥|¡Âòë Ó ^33©ÝÍÍäVv!>âx¢ÀÍ|"ãØeèZ²Ì²ÃM'ÇÁ .'SÛéìn&Åà3LÃghDs¾%k(ÝiÃëâ°³|¯ ¤gKç · ©×AshݨÕDµXH-^Jd66S\w,û¯Û;"YEa:Sfþ:/Ùh+/u#ò¢&«º(9ÕÂ0ñz }¶ Éu+Üjµâ ÃÃ`Äï]É jTY,ÃÚÿJÇíCô:©s¦ø¸â®NxSþ{~â¼óý Q."kËX[)C®EO}\ò5ô¡aÈ §0q&Þ@c·ì|¸~(â¼j=b© `FÃ,æÎ}µL¡·E´¦yy=ÐÜ¿ÅÊÁ°F·M¹îaÇ ×&áz´°7×ðï4,È£ÔKw{GBw¼ Ô=¤s_ÆñÐÃôµ6#nöOSðóRIHÿÜorzyá¬rçiz}/8Ǫ}Ó´òó¡^2 CèÁMУájRïmÐÛécr#è $Aì}v)·èô»à*nÓ©Õ$Wð1ÜÁ0!w óT\dÄ6!a5!÷pß7"èÄ<¤d¢ï] ÚBí_áûãÕ3(;gì¢3¤ ;Fâ]§¸ñÃå«R5µªTÀ1!_.*Ó(÷Gvþh·±?PK)Á.® å0ýþfwçëûãÀW..\t]ôZ´±ÔöÑD¡×wÁµHl'ê~ðÊÐç¡\ØØ$K©X·?¨æÚåðQhMJXíb¿Ô7 "Ôáñ$5ÃMqIÎ󹿾è&ODQékfrkzLG/ëÃß,ÃõÞÎÐùûÂôm&C¢î¸L´k9 n¶»ª30Ô¨hï ÁÁ1¡:!ºKLztE9)VEiÓuïPÿç :£s ç?PKÞôÍ Ôòª*w¨wGPKÛäwé á ¡°ËþüÏ¿1\ï6>lôRihò0ð¾ù+E*u$SÄ:øF¢;Ò÷ü:CpyÈâPµÞ«¢4Rï ·Ý¨^jzþàù¡ÕW*Â0XNWs%¥*SÚ«=ÏJ⥢Ìå¨qÞã¢å.Q!§FOºþù6Ð`kò/,EBöM;èÞÔÁWö ¼]PKªzI(Ô =À~tP§;âCÙòD^OÙ;ýèYRì¹AkäʲTD+xÞyĶë=S¼µÔå못es**(®%0(^%°¥^#Ë0xñõ$æ2é>ã_«¡÷4Åõ\uäÒÖÒ;¥k]7jX¯DóØÙ·aòÿÞñ~h>u¨_j ×ig2Âðô7°¯ôÐmü8ªa¢¬Ñ©±Ý{Ы1I¤ ûЯñ&n8 qCéeÂÑ RmWJÓ'hÛLÏ =ý¥Ë }ö2øMû?:§ÛUÿjNúil|¢ÇÚHçî:÷÷"ìP:[³3éfØ U#áºO¹6@AA PGó'ª}v;&§ ø}Ü3_Ox"xE8HÓµäºm/ÎE¶a³ºÌ´ç̧+õ§ÌòJ¥S9ç5Öªû¾t\kMK?À¶c*a.íÐ( yM] ¬ûc¶K¬ú§£}dÀ½ð¥Ô¬-?°Et³Ú>u¤ÝNÄ#º9[uT7g[m» 4JS"bØüZ%CiÙò´î7Cè2£ñ. ZoÌà ¦Hý©<0XY°¶gî;±o$¨coäÁiPÎhÆ1ÃFbÜ3è°Cs¹Ä!%KÅ_*&ØÁ?t2¢WÈæ5Öo{m3Ö6·ÁWFáSÙëðÆñï ë4ìö¢¼¬¿PKGÂG --- NEW FILE: axis.jar --- PK «¢·íZ?øÌj¾¦jp{Dê[©·ñdMWc6¨0®±³ 5þ7,³«¤%{ Hì¶jݯò%è^F£n} [...4700 lines suppressed...] 3 K~ m_µ --- NEW FILE: jaxrpc.jar --- PK Gý)y¡áK%®òÅL$·|Óôã9¦< .M3»)CW³VÞjy¦<$wwã©à1*1Tò$*(¦Ò¥BQ¡Õëoê;8Oæâ\#waEØEêGÿÜápSâ§mÈ ö¬û[Tí^Pò5:uÖ)ò·5Å:1vÐ(YÖ@uðãéeióZcÜu ÄÐÃujïPKõØÝ! 餽ÅuÎ)8ZAØ`û´ö²Û[lo :ßüôÓ SWIÔ}pÆEÿúßsø¡ïyï{Þó>ÏûãÞÿ÷ëo ¦êp)#¸,¾§ âW R¨W .×ü¯14ðìªýÖ7¬4CËľ¦ÇMÝJÇÛ ÃÚ+im' xq=ÉWm#g¼®`@¦Û[¥0Á\1ächTPò<#bªèÆÐ©¢ ÞPqQ'ÑÉÐ^÷HqyçUèX"©"(CÇ¡Å`><Æpj?VÂ4yZ7óéb[v>õɰ¨ìFª[î6 çuSìQW±´Î©0°"Ä ±Û«â)S@®Y1ªJóWÂNSko;CÛºgNLUðèÞ??jê ÂdÎËT K¨º64nE|i/ ¯®r+E>8²N©q}VM÷@2£ç)_$¥ 5¬_*4Y[i;C¼P\*¸¤Ú#DÍkÓ©mï8tÖS|Y/ötyÑC/Ó PªðÒJD¢GÌ\OÊ5HûÔB§èkìZ»´0íxîÀ«Å~@=©Pb%øîÀ[d|$¯'¬¸GÈÒîDÁi< HM 1ÕëbÈÇKkTbUxµ¾²¥¯6ì2ÉAÝ@íva£2Y&5AÀCzt@\üÚWðn¤qMT7 Vó°¿úð{5ÇÊ%à¬@¦7a6qz¹(¡%ÔÍêCï:ºôÕXT`u±Å½v±Þq[ÚÓ6à÷mÅî¢á#ø½["|ì;4вVà|ù¥w«Ó äÇÉ'¤mÒ?â§á3Âøþc·+Þ_®|?íÕö¸Ëä.1^vªÖ¢Ðø!wqd®¥i¡o5ʶ9tóF4sË`Øs«r?¬ÐêK°í¢aNó K8ª }×KhÛAû¶4îàØ~©4sà{4âáG÷û4?Q~ÆÓøÃøãøÞ×ß+Ò1ð¼#ÇT\ºdâ-sÓyÖmbÈéÓq§EÇßߪjÐ ¹òêy"ÎÛ 0 ~æÀ Xkòÿ$ùð7]ë*Ëõã"È0 ix0çPrÉ÷H:@½hïKxnËÝg=Nòy ;üPKªá$Ý· m¡-ЫÜ%å°¹¯r¹©A8Ä¡@½ Ç6»ëÒ¼?x 1»6Á i¨øa¿oNÏ®üüö »Ë*Ö4ÆrÆ©â(ëyZü¥:¨æs©òå1¨Y@MrdÚÄA$-ßçL`ª#æÉÚÛºÎ{8m*-±:Ù%pq»½È4ÎOÌ:ÓD»è·´íWís$p ÜÏéBÕ6V:÷»ÒT¡Yjp1Gç± Ú?3UæÛ!U Ë·ßÞòX¢æ.JðÀê¨ÝØiÐɬ'b¯hWÕ;Ìq#ûÈN*4; ØÚL_k5¬YúÂCÖlk=º7N¹Ç!`_ ¡¡8Èî?Êc,ÀyÍ3g ÏÌKy »MåG#GzëFÒ<1_c7ØÙZL#þ½ã]UæÒÒG)ýF=MÅÌ;$òÀr?E^ìã²é|Fï{fÜÅÁNPq:>xZôx'0¸õve xñ¾Þx¢'OðÄxñLÏÂü¼^à0 z¾úþg0tB¯=ð7PK8.[ì§ ¡9U:Z6ã#.XâDîÿø-EBï(ÇéÉ®fVZB#ÖUüN£Ihâ½ $*v£s N°4¸LA )bscFWf½2^9Z °AI1éÏÿO_ó÷ÿó`×Ý/^Á>g§¥Ñßì>¶÷ì³;)¬ {§«b2:I{±ßáj%¸Rv¥ãýÕÔµuWsVkYéíæëPsÀ²3D4^1ó줷1ÕÉmãOµáວRÃaCìnðv«¿X¬<¡´½ÚåÒp@h y_i%@Øm¤A!<EÏGPKæ(¯YÖ "X¶×sùUÚ๠W1ôSk»ù®,òûÊEëêÁH¦NÓÃVÓC.ÕÄJ ºñ^í¦§w¸õô m(=°J%K5Ú34dN shxM k>ªùG é¶?v½J¨"ýNTõÂ5/9ØÔ¶ÀÉì"nUM¿YjAsÓ\_qܽ-DÎVC.-GÛqÕ_(ÁWF)<^üÏͪRõ$iMæÎÎÎèÎÄhogÇÆÆ©R¹Z÷¨Äª8%ûÀÀƺo 8K©DQè{M=µh[ c`RÍÄßôcç;"·+(éy¯]bupA?Ró«Aà \$4*^ÛÌM/Þ30M±Þº¿»ÑÉ*{*9K¾¬yï Åtr=ª9a·kªÒ¼ïÚÀe¸BÆÒ¥ÈQhÌÌ"%]ÎcOõµLpâÿ)p.¡§bÅÊ_MÎ9eýîgþ^Ã)õc6Õ¿Ñ (*¸ºÿ°ø]*±ú#:6ú;û»î£û;ô0e4I¦^MY¦>MÓ!Mh:Êô¦~¦5=Âô¨¦Ç×4À4¨é ¦c3=©éÓSNj:Å3<ÍvýSÚõ³LÏi:ÍN{)a)a)a)íìy¦4½HzõÅAmî°¢ãêÕÀUßѺÚíuåÝTç5´PÇ]øDy_ Á7ØÅ÷¸q¿á#üñ:ý,>ø\Æb_¾VVõâKPK%Ýûô àÂð£Äi}Q\$¹99÷{_^Ô°¥,RXv°ê`!+¾¸e¤JíK~ͽ«Àk¾Ãuô¾T2>`¨natb-UPÿ1§rÊ`7¢3ÁPhK%½®Ð'¼RlG>O¹æ>íøBöé©s47:M#Íà*%t#äý¾ Î^b9ô½ÐÓW¾×â~éTgBoM ÐR½~`'ªg`C2DÜüìÃÒvåNä:Ñ@û¢%|3®Ö]L!í`¡ö¿B©Y_lGHéî®ý!2Mئ3X¦,Z2d):¦{Î|u笺û 9f#OXyDD³#1ÉÀÈÏca,ïÑiÞ¦ª÷°n?ÓdN"ècA¥d_$sL#óPKæô"^x üÿ[© °|zI=é-ô/ÿÆËìH.êñû'3å:6lYרÖÙÚ\¬ùfÿÁ+^Å+Ìlµä)UÂ+ÔÒYpëÖÆUÊ9°Î¡æõTÉð²!UøÀÇ4á7D@#-ã>KÚÙþX rNdÖæzV,nfnVJÐù^ÞR5í)á¨#¤I±LxÛ{ÿ¤Ðxw±30¦;1f/sËão*E#ëÀÚ sûʹìHo²`yKréa6ai[§´.GæîRÔÂÃ]ÃH1swR©k§vÌíS·*öÕº#·äÞ"__UÒmEã2s9Kº¸á5·Ow²îÎ$Î Ø'qzlÛ¥ªëí_LÍA6Ï× dµj×9åWÞ5Ê;yõæeÜÏ®-¨w°´=T[±©K(q¸6[yÕ]×åÝceG5åy0r¦J¨«|qåó ââ«Bîê2Êä;"ÎÊgÓ¬ÉìÒçÌt~Ò«¼ämñª!~,Â[°Å¥+¶@ë·Ê¯®Îõ¬Bü±÷s½³E Ö t£bGù °~¾3Ã%Âyx:e#/ ¨WßAüM0ÔÆV£@âÍTñQ _Q ±i?´ÑGQÕ}´!¸ aLÛ4Äpdú(fìÇLI4Ë%©fcö¾ºQDH:çnÌÝ×>ùÝõ#XxW/jsÞäÃbTÏZlB;æ©ÿs-b^J+êù¨Øb¢&Òãu-R¤N2§ô©#jÏèU\ÑG AS-àlgÝÆÙNR¥IÔí±¨÷Üð߬?YõuÃ8jGïë5ÀÇpL÷G#F¢X¤Ã0*u:+RÔphƱ¤jTJyéÊRu:ª¹^7¨µüw°Ç÷ëý<¹3pfãCäø©>®°R YåP9Ëá|*9&¶§¤EØXÁ±9<0 v¹¦ð¯e¨ÐìâÈqtð(ï j;`II¹e®NRs46¢nß´N+Ò f?äi6»-1Ð `yK0ÆaíVqeK(ÃIÝÑàÞ87EC´åªàdjã¢B¨¥èÒt@ÃA£XÝB¸HÖ´¢¸°DJVc8Î< FÌä¸1²\Z\&\q=%ÜÈØÚÏ8ºQr£e81ݸ·âvÞÁÓ;¹{7á<{ñîÃÃ8ÈûñàíÁ£DòXÆ'p?TVà ± OxZg gð9±Ï~¼ Îç÷¼$öò)ãû:F<#¸ñÍÙ $°2ÉR¥N®Æp(Ĥ ðÂÏãñÿóåϯ÷ Âñ¿Ó¶¯ m2uõ¸âÄù Ñ?FkçÛ ZMúPÞ¢¬8íùÎ+vÐx^Å>.ÉIho`ðPKdúèj Æ@>¶vÈtÚôB>ë«_¢D?À2î}:´u:@îsöýçïÏß !¦' :¯O!ââ/Dß"vøw]6G6Ùd7 ¼¶èÖÅôËÓÉÀ7|`*¹&§Wx k'0ƸyÄɾ¡Ìw»OßÿÆ.ë}l¾ñ@Bßx¤¾ñP<ÂMÜò;¯Scî:îejo:*fð _à6îøX¶~xÿ@äÛÊÐÎÖñó¸F$$2 £sðxÜx!DâA"BÜ£u!b|¦/çau¹ñ},1D¾y ³þPKe£ª` ýÜýâüÄý`Ç \ÐÐòè0£(#6E^Üþ Å*JïtI·¤IIÓÒ×ò Àg·Ezð°³³³óÿß0_ï ^3Ôo4YÝ2T{çcë>Po+LR1ÌçPÏ<TéYÌå«D¿Ë¢µ&KKã¼ 6s¨EL39jùGyQ|±êÁT éõvL¢áÎS«Xí}ºKÝ×B{h¸¨ÃfðÿOfho±£h&âÃÙn}¡ÀÒÓ@Zs 2âStè æ½ï}uSÀ¥è 8@n-nâuWèv´Ø¿xGeëÐ$4ðHø!ÁFÆÉ+ºK'éô l´mÚè0T×"^Icâ1XWQe×îÙÁ¼M§4j¢DW@ªGÄÔi ÒPÄc¡"]M3EKÓÁ\¬Åo1WÏ!¥ñTª%÷¶¼QJlïòÆ%Yw'¶qÒ ¥iö/\_«¹ØAÍ áä_òMã±Hø(Ë0c8þZ0pA1AkÑcÚ®fPFÖªx>ª½7°|¼KÑÊ>\nÀêôkr£$û6èw4¹wþ ãG¡NÖÀ=ÙÉl+u t©¤3½^ óö¿PKôV* tè×d·&ûnÐokòðìB¬G²Ù¤TêWèZIgz%½@·äþPKG·áª" QÏpöO }yG¦2ÎNÿoèÒì<ÐÌh1K£¹æèDpݸ{ í7°÷¼O±èBᦠNÐ [¥Ù#u n[ÃwTö ?%ØLwêê²ÊÔHjöþPKܾÿ. ÅÀCëZ':¿ah.æîmº I7ÔëHe22Ôéi,Í\fÚÖuÓÍzÃ0Wr+w|·6<{ù25m¸0©ÌïÊâÀ#aü´Èb%´èýL¬H=´´à1ÿ«JÃLø,Z©8g8ûV1pI·pA7 ǬÝÉ¡l)úTñr4Ço`/åxb«l tè·änMvè÷-y<| ó£Ð!kàì§d6+ºV²]É.Ð+yßPK»þ= áµ<>eÝpÀïûMæûçóÀ ï&45^L6V8hð\]Rv ¯åÁxð|(ã´¨¶Óùÿo:_ï ÉÐæb-¸éGY:½f¨Ü$iß2:Ý{M¨°%©±ÔOb¬(Ó²X¨Ð¹ïn>KV]k»á âzóY¦&R¯,âYåRê{"^«ó³õ³BÇ2Lkû®o$P PÇpñO }yOç2ÎÎÿo¸¢Ù¹ ÑbFsuèDp>ݸ}ʽ7°û|H±b!Á¶ °&ÝÚܪ̩-º=m=ÃúêÐ$4pKø Á¦¦S¿TWt¦GÒ´¯ó PK[9ìH$ ígBÐÀðºew5Iyj%µ@»ÐíPKD$#E0 æ M¿VcâàðCß$:8Ü»÷ç÷çå}~½ Þí" %KKx-ÆÄàCg·M8àÁÃÎÎÎÎ÷ý&óýóù`íÊ8wÑqqá¢ËPÙ8ÑRìÅúONoªwjÒ{rp5cp9u6Fj-ÇÙ*úY1UÚ£$ñLheÞEÑIjËз¾{¾_Å\o"¾Hâ¹ÔÛñ¢Åf#õ£°MaÀÞ4Ét$Êøö#òq*\à¿Læ8 2J.ÿVç ÜÐÐâè0£å(#:E^Üþ eÄ¥èRÅÍP¼½ïC¶yôáQô Ð [¥Ù'u nWW¯¨ì;4 <~L°éÔ+Ôe'éô 1Þ®eSW¡5mQn|'M4&^ø ),§±Æ*áðN( µ[þÀí÷\»qøüº%ö&ö¥'£dyë!Uñ¤©IOvÚ×"h(!Ã|ÍwxëRãËTt#CuÍîÚÝvËîûäðêâ¬rÔuÄ}$}ªÊCåëQ =wOK·ErWóGÖ´±s(ÖbùÏPÎMt'Þ6Jå?öaÖýNàªTóåM²«r²Ä23YL ͰöïôËJ/mÑbÞÊ dô¬A> kÒɦ¿Ö;Ø9 d´T]#K6Û`9 ¢ÆâäR'ÚÚ~GbmêÛ:å44¡ØSÅåÍbNÄ|Ì:'MþͲvÞ BMJ-*7ãýæÙõ÷_¿PqPÀ"vóØËãÃa5úqÓµÌj£«m½n6tõú©8ÜÞ[qèx·+ïE±ðâ¶pÇRÁãK hæQÍø à ÃÆ\Ó>ê'ÕnÇ:RðôR¡¦àY*|jÖþ<ý¿ óeÍ`èV·ªµÌ¦ ÃÚLÊô~~1K_0,¿s<'~ϰ¸_n3ä4¿/Vë'ñ¨'Ãè¹2o·-B'áY2a/ÙOG.b$£@Øò|j°`ùãÐÇN²qû¢EMjq;¥«êÑmæ¯döN¥3ä#_Ò;û½²éVÓ¨F¡<ãà ç=#©T>ñ©~8àÉÓ^éúäÿåµý>ýä\åvìÜS:difL&êäuêyuxøwNêVºÞû'-±ú©kØAK ÷$Z@XÉp¢2|¸áâ^%^ËðMâõoßÊð&ñV·iÅ·¤x2<e`©òìsj¹Kq9Mj¸G±øËûx@_©«ôPKu ü>ê |·±# ÔüæÖ¼íy¦eGoõÀñh¢õæáq[@嫺}7ØÈ~+nßû¥nßi{Ço[lË;±|Wòð0\º×Z0KL¶þªUm/tVKÒGo ¾íÔ\Öþº"÷ dQ0``R ðÏ åÜ$RÒ²dHE8ìt;À*}Ñ ú'QBsr{:ìî*© º±1 º^A· ÜS£¤Y Em$p<±üx3¬%tôÌÃXÓdDËPî>åb|xÆ2Æx Ñ0B¸¼Ï¦@ñêi62Bô1ÆqÆãc]fß²ÖH¸NItºÀÆPKàAîJ Â@£ë[;!6 Xìãú 1 (ñjÀC»"yÍ0ófy¾î %Këb#f¤90û~3¿QÁ;Ï·à[Þ¶ÌaÇ*]Ë=ç@ÿ PK [± Ö[jG8ÛÒªb³ 6¾©N`,À]e&I¶ðî3Y;j!²úåm¶Ì6r·åù°ïl«`øÖ:½¶ò õ?¶iA¸ên"¥ïÿÔn:ísõø²d 0C9d&Ìf9(QÀ`2Ì",¥LÓµ+Ä2X¥ÿ¬½PKÔå n Råâ5¸Ãbì`Ø]bb@ö¥0 )ÙùJhL\ø ÒìÄÁn{1ì3h¶5plíÞYfÏr:f£ë¹OV«Ç+Ñ3á¿Ê.7"çnÔépøõ°ßâ^C 25×¶zMËò#~W=6Çýé=Úf{#aó±Í}á:T&[úS¿î{ÂéTd½XVGX0KÒ"Y ÒÊ«Tû4ÒoOÖ/¯X^wÍ/ 0;?Ê©LJb qiÒIDc8ü~YiGôN=£0d5ò MV§Iy§`¯äPR¼Blr"À:R D-ÉUR¤Ú( 4ËÖU´A9·¨ô6°© ¯!°nH¦B±wgÀº² ÈI|§ Å| MPéÉIC ¿à/Vu9§Q^B÷iSCÚËèOËú®+¦ly٠ݽ!ü2·»ç¥»Ë)UþPKîÍX¡ ºEÝEãI6%!ÖmmÂi;dm¦[¨¥/b4Qý(ãÝ¥Ö¢ÑLvïÌ{Ϲsg¾}ÿø,,¦q#°lâÛ&)ä,X1qa¶Z¬Ô×ŵ§ ÚFeëõfec³X©m1dJ»|{WM¯i©yÉB¨:WQ]Áz,0:¹:Qw*I%Êݽm¡k|;1Yèó εÇ}ÐZ²Ã0õ¼Þ^àé¶ïU Þ¾Xã~ê7$:¡ÄÁz"ëSÔû[ 1»vKËÌìÌ{ófÆþõûÇO 1Ìiä0dÐcXÒX×çAÏmëA*½8'"æÒg¨N´|àîéáe ã'¯HÏ*ý#3+Ñê0»z¹ÅäßÑïúBzÜïðHªw4ãwrȰ9Ñ0xiÓö³çûjç#Ob´Ý±N¦2«ÍÖ W\8 ·³C.g©SÎâvÒké½´vNãüI+í0<±/Õ2ÕÙ·ÑÆ"îÙ¸² ælØÊÌcaã¿öf¨ÿùeIJ/&+ÍÙZ¬ÓW¢ÿÒ¡´)2¼övæiòèá2Ù+ôúDy|ÃÙúæÜÃp¶Æ(8Æ09õUÈÖI8&ÂkjþÚp,£KyW©ò0mE¹@Gj¦#5¡#5NAGj ê×PÍÆqÉ+¼å|ñåL¸¨¾±S@&Âpµraäë¹dsü1ÜÀ²5MþK^Õ¨ òJD®:E«&ÈêRc y²¼@/ÉÐ+©´¢#%]!«æsÂf>Ö¬l!=.$Уèp^Kñ!-Ï˾ÌÖ¨TòõØúNd]©T¿#3V×äi@íòXUT®âÚÔ¿!óebgH·(ÉHvÒÈGâ|ú¼üÍ/&ÉNùhä¦DmþPKÒëB \!¯@ÁyÞä%-óì"ÏÞâÙJoÇð@lyiqýêÚ@ºpËøÐЫF½¢]ÛªWÎäuÇ5êîQmq¢¶il¶ÀBîè;µªî;úµÕÂ< ¨¤UßnºÅFÓ.=~+Ý#òµê» Öf6"ùÆ&E¬ºy©Y+öºQªL®Q6ªmñÚÛ¸[#p\ß\Û¨;7vMæ*.^ó3ÔÐÊ Mkû«éúHÃrHßJï63´~)] 0UéÛêîjâ·×¬l kw Åß%Y ø ZyrÖI^¡èZEëb¤0Q²7ÂMÄH*)mG;H|Ç©13ç`îRÏL¸¹|£}àAm²ï°N |ÖNsÁ8ßñNXe樼Ô?¤ Q ¨ónÚÔóAÔC¾Ô?!û)F > nS?íOýG½ÔïP »Tá }<Ñò> E}?q±"®*Åsdúûþâ+Ó³î¬D½DQÎoDz3~ç|D½D~÷%ò;¹!"1/?(çÏ Þí" n --- NEW FILE: jboss-j2ee.jar --- PK [...2403 lines suppressed...] èU Index: idrs.jar =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/lib/idrs.jar,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 Binary files /tmp/cvsC1ya9Q and /tmp/cvsaQRwwr differ |
|
From: Marc B. <big...@us...> - 2004-08-22 05:18:22
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/core/servlet Modified Files: ConfigInfo.java IdrsController.java Log Message: First pass at integration with Axis Index: ConfigInfo.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/ConfigInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConfigInfo.java 17 Mar 2003 14:05:00 -0000 1.2 --- ConfigInfo.java 22 Aug 2004 05:17:39 -0000 1.3 *************** *** 463,466 **** --- 463,479 ---- this.vars = handle.getVars(); } + + public void loadFromConfigPath(String loadFrom,String parseClass) throws Exception { + + InputSource in = new InputSource(new FileReader(new File(loadFrom))); + IdrsConfigHandler handle = new IdrsConfigHandler(this); + XMLReader parser = + XMLReaderFactory.createXMLReader(parseClass); + parser.setContentHandler(handle); + parser.parse(in); + + this.dbs = handle.getDBs(); + this.vars = handle.getVars(); + } /** Index: IdrsController.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IdrsController.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IdrsController.java 19 Apr 2003 03:13:49 -0000 1.4 --- IdrsController.java 22 Aug 2004 05:17:39 -0000 1.5 *************** *** 528,532 **** secure.getUserName()), init.digestPassword() ? init.getDigestType() : "NONE", ! servletContext); //send content to the client --- 528,534 ---- secure.getUserName()), init.digestPassword() ? init.getDigestType() : "NONE", ! servletContext, ! null, ! null); //send content to the client |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:58
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/core/report Modified Files: IDRSHead.java Log Message: First pass at integration with Axis Index: IDRSHead.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** IDRSHead.java 19 Apr 2003 03:13:48 -0000 1.17 --- IDRSHead.java 22 Aug 2004 05:17:40 -0000 1.18 *************** *** 15,18 **** --- 15,21 ---- import net.sourceforge.idrs.jndi.*; import javax.naming.*; + + import org.w3c.dom.Element; + import java.lang.reflect.*; *************** *** 156,160 **** */ public void init(HashMap conns, int userNum, int docID, String url, HttpSession session, ! HttpServletRequest request,HttpServletResponse response, Application app, IDRSScriptLanguage context,UserInfo userInfo,String digest,ServletContext servcontext) throws Exception { this.context = servcontext; --- 159,163 ---- */ public void init(HashMap conns, int userNum, int docID, String url, HttpSession session, ! HttpServletRequest request,HttpServletResponse response, Application app, IDRSScriptLanguage context,UserInfo userInfo,String digest,ServletContext servcontext,Element dom,String basePackage) throws Exception { this.context = servcontext; *************** *** 219,222 **** --- 222,229 ---- if (obj.setProps()) obj.setProps(request); + + if (dom != null) { + obj.importDOM(dom,basePackage); + } } *************** *** 254,259 **** if (varVals != null) { for (i=0;i<varVals.length;i++) { ! if (varVals[i].equalsIgnoreCase("UserID")) { varVals[i] = Integer.toString(userNum); } } --- 261,273 ---- if (varVals != null) { for (i=0;i<varVals.length;i++) { ! //if any of the values are null, then that means we are in XML mode ! if (varVals[i] == null) { ! varVals = new String[0]; ! break; ! } else { ! ! if (varVals[i].equalsIgnoreCase("UserID")) { varVals[i] = Integer.toString(userNum); + } } } *************** *** 766,769 **** --- 780,800 ---- } + + public List getRequiredDBs() throws Exception { + ArrayList ret = new ArrayList(); + for (int l=0,m=dbNames.length;l<m;l++) { + //retrieve a connection + //key = (String) keys.next(); + String key = dbNames[l]; + // System.out.println("KEY : " + key); + DB db = (DB) dbs.get(key); + if (! ret.contains(db.getDBName())) { + ret.add(db.getDBName()); + } + + } + + return ret; + } } |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:58
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/utils Modified Files: ObjectStore.java DB.java Removed Files: RSMetaData.class Log Message: First pass at integration with Axis Index: ObjectStore.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/ObjectStore.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ObjectStore.java 17 Feb 2003 02:48:48 -0000 1.10 --- ObjectStore.java 22 Aug 2004 05:17:39 -0000 1.11 *************** *** 16,19 **** --- 16,25 ---- import java.lang.reflect.*; import javax.servlet.http.HttpServletRequest; + + import org.w3c.dom.Element; + import org.w3c.dom.NamedNodeMap; + import org.w3c.dom.Node; + import org.w3c.dom.NodeList; + import net.sourceforge.idrs.script.IDRSScript; import java.io.*; *************** *** 420,423 **** --- 426,526 ---- return this.propName; } + + public void importDOM(Element root,String basePackage) throws Exception { + this.importDOM(root,this.obj,basePackage); + } + + /* + * Imports a DOM tree into this particuler object + * Rules: + * 1. All attributes are properties + * 2. All simple elements are properties + * 3. All complex elements are objects + * 4. After being created, objects are added via the addXXX method + * + * Performance in this method is currently horrible, needs to act similarly to to setProps + */ + public void importDOM(Element root,Object obj,String basePackage) throws Exception { + System.out.println("Entering importDOM"); + Method[] meths = obj.getClass().getMethods(); + + //first import all attributes + NamedNodeMap attribs = root.getAttributes(); + for (int i=0,m=attribs.getLength();i<m;i++) { + Node attrib = attribs.item(i); + String name = attrib.getNodeName(); + if (name.startsWith("xmlns")) { + continue; + } + String value = attrib.getNodeValue(); + + //convert the name into a java property, setXXXX + name = "set" + new String(new char[]{name.toUpperCase().charAt(0)}) + name.substring(1); + Method meth = this.getMethod(name,meths); + if (meth == null) { + throw new Exception("Can complete decoding, method " + name + " does not exist for class " + obj.getClass().getName()); + } + + meth.invoke(obj,new String[]{value}); + } + + //now iterate over the elements + NodeList nl = root.getChildNodes(); + for (int i=0,m=nl.getLength();i<m;i++) { + //we only care about elements at this point + Node node = nl.item(i); + if (! (node instanceof Element)) { + continue; + } + + Element elem = (Element) node; + String name = elem.getNodeName(); + //if the element's only child is a text node, it's a property + NodeList children = elem.getChildNodes(); + if (elem.getAttributes().getLength() == 0 && children.getLength() == 1 && children.item(0).getNodeType() == Node.TEXT_NODE) { + System.out.println("Seting property : " + name); + // convert the name into a java property, setXXXX + name = "set" + new String(new char[]{name.toUpperCase().charAt(0)}) + name.substring(1); + Method meth = this.getMethod(name,meths); + if (meth == null) { + throw new Exception("Can complete decoding, method " + name + " does not exist for class " + obj.getClass().getName()); + } + + meth.invoke(obj,new String[]{children.item(0).getNodeValue()}); + } else { + //it's an object, we'll instatiate a new instance and add it + + name = new String(new char[]{name.toUpperCase().charAt(0)}) + name.substring(1); + + String className = (basePackage != null && basePackage.trim().length() > 0 ? basePackage + "." : "") + name; + System.out.println("Creating object : " + className); + Object newobj = Class.forName(className).newInstance(); + + //add the new object + String addName = "add" + name; + + Method meth = this.getMethod(addName,meths); + if (meth == null) { + throw new Exception("Can complete decoding, method " + name + " does not exist for class " + obj.getClass().getName()); + } + + meth.invoke(obj,new Object[]{newobj}); + + //import all children nodes + this.importDOM(elem,newobj,basePackage); + + } + } + } + + private Method getMethod(String name,Method[] meths) { + for (int i=0,m=meths.length;i<m;i++) { + if (meths[i].getName().equals(name)) { + return meths[i]; + } + } + + return null; + } } Index: DB.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/DB.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** DB.java 26 Mar 2003 21:33:11 -0000 1.15 --- DB.java 22 Aug 2004 05:17:39 -0000 1.16 *************** *** 387,398 **** ! ! for (i=0;i<vals.length;i++) { ! cls = clss[i]; ! val1 = ObjectStore.getValue(cls,vals[i],this.con,idrs); ! cls = val1.getClass(); ! finalVals[i] = val1; } if (direction == DB.OUTPUT) { // System.out.println("executing method"); --- 387,405 ---- + //hack to ensure that you can have a method that jsut takes a connection + if (vals.length > 0) { ! for (i=0;i<vals.length;i++) { ! cls = clss[i]; ! val1 = ObjectStore.getValue(cls,vals[i],this.con,idrs); ! cls = val1.getClass(); ! finalVals[i] = val1; ! } ! } else { ! finalVals = new Object[]{con}; } + + + if (direction == DB.OUTPUT) { // System.out.println("executing method"); --- RSMetaData.class DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:58
|
Update of /cvsroot/idrs/Idrs/dev/net/sourceforge/idrs/jdbc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/net/sourceforge/idrs/jdbc Removed Files: JDBCInfo.class JDBCPool.class Log Message: First pass at integration with Axis --- JDBCInfo.class DELETED --- --- JDBCPool.class DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:58
|
Update of /cvsroot/idrs/Idrs/dev/net/sourceforge/idrs/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/net/sourceforge/idrs/core Removed Files: IDRSServlet.class IDRSParams.class IDRSReport.class IDRSPool.class IDRSSecurity.class Log Message: First pass at integration with Axis --- IDRSServlet.class DELETED --- --- IDRSParams.class DELETED --- --- IDRSReport.class DELETED --- --- IDRSPool.class DELETED --- --- IDRSSecurity.class DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:58
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/test Modified Files: IDRSTester.java Log Message: First pass at integration with Axis Index: IDRSTester.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/test/IDRSTester.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IDRSTester.java 6 Feb 2003 20:13:44 -0000 1.3 --- IDRSTester.java 22 Aug 2004 05:17:42 -0000 1.4 *************** *** 92,96 **** public void executeHead() throws Exception { ! rep.getHead().init(conns,user.getUserID(),docID,request.getRequestURL().toString(),(HttpSession) session,(HttpServletRequest) request,(HttpServletResponse) response,app,script,user,digest,null); } --- 92,96 ---- public void executeHead() throws Exception { ! rep.getHead().init(conns,user.getUserID(),docID,request.getRequestURL().toString(),(HttpSession) session,(HttpServletRequest) request,(HttpServletResponse) response,app,script,user,digest,null,null,null); } |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:57
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/axis Added Files: IdrsHandler.java IdrsResourceMgr.java DOMElement.java IdrsProvider.java Log Message: First pass at integration with Axis --- NEW FILE: IdrsHandler.java --- /* * Created on Aug 6, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.axis; import java.sql.Connection; import java.util.HashMap; import java.util.Iterator; import net.sourceforge.idrs.core.servlet.ConfigInfo; import net.sourceforge.idrs.jdbc.JDBCInfo; import net.sourceforge.idrs.pool.DbPool; import net.sourceforge.idrs.pool.ScriptPool; import net.sourceforge.idrs.utils.Application; import org.apache.axis.AxisFault; import org.apache.axis.MessageContext; import org.apache.axis.handlers.BasicHandler; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class IdrsHandler extends BasicHandler { static final String DEFAULT_DB_POOL = "net.sourceforge.idrs.pool.JDBCPool"; static final String DEFAULT_REPORT_POOL = "net.sourceforge.idrs.pool.IDRSRepPool"; static final String DEFAULT_SCRIPT_POOL = "net.sourceforge.idrs.pool.ScriptContextPool"; public static final String CONFIG_LOCATION_OPTION = "config"; public static final String CONFIG_PARSE_OPTION = "parseClass"; ConfigInfo config; IdrsResourceMgr mgr; public static final String IDRS_RESOURCES = "IDRS_RESOURCE"; /* (non-Javadoc) * @see org.apache.axis.Handler#invoke(org.apache.axis.MessageContext) */ public void invoke(MessageContext ctx) throws AxisFault { if (! ctx.getPastPivot()) { System.out.println("inbound : " + this); ctx.setProperty(IDRS_RESOURCES,this.mgr); } else { System.out.println("outbound : " + this); } } /* (non-Javadoc) * @see org.apache.axis.Handler#init() */ public void init() { super.init(); // retrieve the configuration and servlet context String location = (String) this.getOption(CONFIG_LOCATION_OPTION); String parseClass = (String) this.getOption(CONFIG_PARSE_OPTION); this.mgr = new IdrsResourceMgr(); //configure the system config = new ConfigInfo(); try { config.loadFromConfigPath(location,parseClass); System.out.println("Completed config! " + config.getVars()); //create the application object this.mgr.app = new Application(config.getVars()); //load database pools retrieveDocDBs(); //load script contexts buildScriptContexts(); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(System.out); } } protected void buildScriptContexts() throws Exception { String scriptPooler = config.getScriptPoolClass(); scriptPooler = scriptPooler != null ? scriptPooler : DEFAULT_SCRIPT_POOL; try { mgr.scriptPool = (net.sourceforge.idrs.pool.ScriptPool) Class .forName(scriptPooler) .newInstance(); String scriptClass = config.getScriptClass(); int poolmin = config.getScriptPoolMin(); int poolmax = config.getScriptPoolMax(); int idrsDaysOpen = config.getScriptDaysOpen(); mgr.scriptPool.build( poolmin, poolmax, scriptClass, 2000, "contexts.log", 10); } catch (Exception e) { e.printStackTrace(System.out); } } public void retrieveDocDBs() throws Exception { Connection con; String dbPool; int i; int numDBs; dbPool = config.getDbPoolClass() != null ? config.getDbPoolClass() : DEFAULT_DB_POOL; String tmpUser, tmpPass, tmpDriver, tmpName, tmpLog, tmpAlias = ""; long tmpDaysOpen; int tmpMin, tmpMax; mgr.dbs = new HashMap(); net.sourceforge.idrs.pool.DbPool tmpDB; JDBCInfo cur; Iterator it = config.getDbs().keySet().iterator(); while (it.hasNext()) { tmpAlias = (String) it.next(); //System.out.println("DB Loaded : " + tmpAlias); cur = (JDBCInfo) config.getDbs().get(tmpAlias); tmpDriver = cur.getDrivername(); tmpName = cur.getUrl(); tmpUser = cur.getUsername(); tmpPass = cur.getPassword(); tmpMin = cur.getMin(); tmpMax = cur.getMax(); tmpDaysOpen = cur.getDaysOpen(); tmpLog = cur.getLogPath(); try { tmpDB = (DbPool) Class.forName(dbPool).newInstance(); tmpDB.build( tmpDriver, tmpDriver, tmpName, tmpUser, tmpPass, tmpMin, tmpMax, tmpDaysOpen, 2000L, tmpLog); //System.out.println("Adding " + tmpName); //System.out.println("Adding " + tmpAlias); mgr.dbs.put(tmpAlias, tmpDB); //con = tmpDB.getConnection(); //System.out.println(tmpAlias + " " + con); //tmpDB.returnConnection(con); } catch (Exception e) { e.printStackTrace(System.out); } tmpAlias = null; } } } --- NEW FILE: IdrsResourceMgr.java --- /* * Created on Aug 7, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.axis; import java.util.HashMap; import net.sourceforge.idrs.pool.ScriptPool; import net.sourceforge.idrs.utils.Application; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class IdrsResourceMgr { public Application app; public HashMap dbs; public ScriptPool scriptPool; } --- NEW FILE: DOMElement.java --- /* * Created on Aug 1, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.axis; import org.apache.axis.encoding.SerializationContext; import org.apache.axis.encoding.ser.DocumentSerializer; import org.apache.axis.message.SOAPBodyElement; import org.w3c.dom.Document; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class DOMElement extends SOAPBodyElement { private Document document; public DOMElement(Document doc) { this.document = doc; } /* (non-Javadoc) * @see org.apache.axis.message.MessageElement#outputImpl(org.apache.axis.encoding.SerializationContext) */ protected void outputImpl(SerializationContext context) throws Exception { context.writeDOMElement(document.getDocumentElement()); } } --- NEW FILE: IdrsProvider.java --- /* * Created on Aug 7, 2004 * * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ package net.sourceforge.idrs.axis; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.FileReader; import java.io.ObjectOutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.StringBufferInputStream; import java.sql.Connection; import java.util.HashMap; import java.util.Iterator; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import net.sourceforge.idrs.core.report.IDRSRep; import net.sourceforge.idrs.deploy.compile.RmlCompiler; import net.sourceforge.idrs.pool.DbPool; import net.sourceforge.idrs.script.embedable.IDRSScriptLanguage; import net.sourceforge.idrs.utils.Application; import net.sourceforge.idrs.utils.UserInfo; import org.apache.axis.AxisFault; import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.handlers.soap.SOAPService; import org.apache.axis.message.SOAPBodyElement; import org.apache.axis.message.SOAPEnvelope; import org.apache.axis.providers.BasicProvider; import org.apache.axis.transport.http.AxisServlet; import org.apache.axis.transport.http.HTTPConstants; import org.w3c.dom.Document; import org.w3c.dom.Element; /** * @author mlb * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ public class IdrsProvider extends BasicProvider { public static final String CONFIG_IDRS_RML_PATH = "rml"; public static final String CONFIG_IDRS_BASE_PACKAGE = "basePackage"; String rmlSrcPath; String basePackage; private IDRSRep report; static int count; private boolean doneinit; /* (non-Javadoc) * @see org.apache.axis.providers.BasicProvider#initServiceDesc(org.apache.axis.handlers.soap.SOAPService, org.apache.axis.MessageContext) */ public void initServiceDesc(SOAPService srvc, MessageContext ctx) throws AxisFault { } public void invoke(MessageContext msgContext) throws AxisFault { if (! this.doneinit) { this.firstinit(msgContext); } IdrsResourceMgr mgr = (IdrsResourceMgr) msgContext.getProperty(IdrsHandler.IDRS_RESOURCES); HashMap dbs = new HashMap(); IDRSScriptLanguage script = null; String buffer = null; try { List dbnames = this.report.getHead().getRequiredDBs(); Iterator it = dbnames.iterator(); while (it.hasNext()) { String name = (String) it.next(); dbs.put(name,((DbPool) mgr.dbs.get(name)).getConnection()); } HttpServletRequest req = (HttpServletRequest) msgContext.getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST); HttpServletResponse resp = (HttpServletResponse) msgContext.getProperty(HTTPConstants.MC_HTTP_SERVLETRESPONSE); Application app = mgr.app; AxisServlet servlet = (AxisServlet) msgContext.getProperty(HTTPConstants.MC_HTTP_SERVLET); UserInfo user = new UserInfo("-1",0,"user"); script = mgr.scriptPool.getContext(); SOAPBodyElement bodypart = (SOAPBodyElement) msgContext.getRequestMessage().getSOAPEnvelope().getBodyElements().get(0); Document bodyDoc = null; try { bodyDoc = bodypart.getAsDocument(); } catch (Exception e) { e.printStackTrace(System.out); throw AxisFault.makeFault(e); } System.out.println("Base Package : " + basePackage); this.report.getHead().init(dbs, 0, 0, "", req.getSession(), req, resp, app, script, user, "NONE", servlet.getServletContext(), bodyDoc.getDocumentElement(), basePackage); report.getHead().setSendToClient(true); buffer = report.buildReport(); } catch (Throwable e1) { // TODO Auto-generated catch block e1.printStackTrace(System.out); } finally { if (script != null) { try { mgr.scriptPool.returnContext(script); } catch (Exception e2) { // TODO Auto-generated catch block e2.printStackTrace(System.out); } Iterator it = dbs.keySet().iterator(); while (it.hasNext()) { String name = (String) it.next(); Connection con = (Connection) dbs.get(name); try { ((DbPool) mgr.dbs.get(name)).returnConnection(con); } catch (Exception e3) { // TODO Auto-generated catch block e3.printStackTrace(System.out); } } } } if (buffer == null) throw new AxisFault("No report content"); System.out.println("buffer :\n" + buffer); DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder domBuilder = null; Document doc = null; try { domBuilder = domFactory.newDocumentBuilder(); doc = domBuilder.parse(new StringBufferInputStream(buffer)); } catch (Exception e) { e.printStackTrace(System.out); } Message resMsg = msgContext.getResponseMessage(); SOAPEnvelope resEnv; // If we didn't have a response message, make sure we set one up // with the appropriate versions of SOAP and Schema if (resMsg == null) { resEnv = new SOAPEnvelope(msgContext.getSOAPConstants(), msgContext .getSchemaVersion()); resMsg = new Message(resEnv); msgContext.setResponseMessage(resMsg); } else { resEnv = resMsg.getSOAPEnvelope(); } Message reqMsg = msgContext.getRequestMessage(); SOAPEnvelope reqEnv = reqMsg.getSOAPEnvelope(); DOMElement body = null; body = new DOMElement(doc); resEnv.addBodyElement(body); } /* (non-Javadoc) * @see org.apache.axis.Handler#init() */ public void init() { System.out.println("in init"); System.out.println(); //get needed info this.rmlSrcPath = (String) this.getOption(CONFIG_IDRS_RML_PATH); this.doneinit = false; AxisServlet servlet = (AxisServlet) this.getOption(HTTPConstants.MC_HTTP_SERVLET); String webinf = servlet.getServletContext().getRealPath("WEB-INF"); System.out.println("webinf directory : " + webinf); } private void firstinit(MessageContext ctx) { try { // get needed info //System.out.println(ctx.getService().getOptions()); this.rmlSrcPath = (String) ctx.getService().getOption(CONFIG_IDRS_RML_PATH); // compile the RML page AxisServlet servlet = (AxisServlet) ctx.getProperty(HTTPConstants.MC_HTTP_SERVLET); String webinf = servlet.getServletContext().getRealPath("WEB-INF"); System.out.println("webinf directory" + webinf); String rmlTrans = webinf + "/rmlTrans.xml"; String rmlSchema = webinf + "/rmlSchema.xml"; String parseClass = "org.apache.xerces.parsers.SAXParser"; rmlSrcPath = servlet.getServletContext().getRealPath(rmlSrcPath); System.out.println("rmlSrcPath : " + rmlSrcPath); this.basePackage = (String) ctx.getService().getOption(IdrsProvider.CONFIG_IDRS_BASE_PACKAGE); StringBuffer buf = new StringBuffer(); BufferedReader in = new BufferedReader(new FileReader(rmlSrcPath)); String line = null; while ((line = in.readLine()) != null) { buf.append(line).append('\n'); } this.compilePage(buf.toString(),new PrintWriter(new OutputStreamWriter(System.out)),parseClass,rmlTrans,true,rmlSchema); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(System.out); } this.doneinit = true; } public void compilePage ( String src, PrintWriter logger, String parseClass, String rmlTrans, boolean isFile, String rmlSchema) throws Exception { //System.out.println("Compile : " + compile); RmlCompiler compiler; try { //report = (new IDRSCompiler((String) src, false)).setLogger(logger).buildReport(); compiler = new RmlCompiler( logger, src, parseClass, rmlTrans, isFile, rmlSchema); report = compiler.getReport(); } catch (Exception e) { e.printStackTrace(logger); } } } |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:56
|
Update of /cvsroot/idrs/Idrs/dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680 Modified Files: build.xml Log Message: First pass at integration with Axis Index: build.xml =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** build.xml 9 Sep 2002 21:27:42 -0000 1.11 --- build.xml 22 Aug 2004 05:17:42 -0000 1.12 *************** *** 15,21 **** <target depends="init" description="Compiles updated sources into into classes directory based on the libraries in the lib directory except idrs.jar" name="build"> ! <javac destdir="${classes}" includes="net/sourceforge/**" srcdir="${src}"> <classpath> <pathelement location="${lib}/servlet.jar"/> <pathelement location="${lib}/xerces.jar"/> <pathelement location="${lib}/xerces.jar"/> --- 15,25 ---- <target depends="init" description="Compiles updated sources into into classes directory based on the libraries in the lib directory except idrs.jar" name="build"> ! <javac destdir="${classes}" includes="net/sourceforge/**" srcdir="${src}" debug="yes"> <classpath> <pathelement location="${lib}/servlet.jar"/> + <pathelement location="${lib}/jboss-j2ee.jar"/> + <pathelement location="${lib}/jaxrpc.jar"/> + <pathelement location="${lib}/saaj.jar"/> + <pathelement location="${lib}/axis.jar"/> <pathelement location="${lib}/xerces.jar"/> <pathelement location="${lib}/xerces.jar"/> |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:56
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/deploy/compile Modified Files: RmlCompiler.java Log Message: First pass at integration with Axis Index: RmlCompiler.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/RmlCompiler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RmlCompiler.java 17 Feb 2003 02:48:48 -0000 1.4 --- RmlCompiler.java 22 Aug 2004 05:17:40 -0000 1.5 *************** *** 64,67 **** --- 64,68 ---- fail = false; } catch (Exception e) { + e.printStackTrace(System.out); fail = true; this.xmlsrc = rml; *************** *** 76,79 **** --- 77,81 ---- } + System.out.println("here"); log.println(transformOut.getBuffer()); log.flush(); *************** *** 98,101 **** --- 100,104 ---- parser.parse(in); } catch (Exception e) { + e.printStackTrace(System.out); String msg = e.toString(); msg = msg.substring(msg.indexOf("###") + 3); |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:56
|
Update of /cvsroot/idrs/Idrs/dev/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/bin Removed Files: idrs.jar Log Message: First pass at integration with Axis --- idrs.jar DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:55
|
Update of /cvsroot/idrs/Idrs/dev/net/sourceforge/idrs/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/net/sourceforge/idrs/script Removed Files: IDRSScript.class DBShell.class IdrsDB.class Log Message: First pass at integration with Axis --- IDRSScript.class DELETED --- --- DBShell.class DELETED --- --- IdrsDB.class DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:55
|
Update of /cvsroot/idrs/Idrs/dev/net/sourceforge/idrs/utils/pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/net/sourceforge/idrs/utils/pool Removed Files: PooledObject.class ObjectPool.class Log Message: First pass at integration with Axis --- PooledObject.class DELETED --- --- ObjectPool.class DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:55
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/rs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/net/sourceforge/idrs/utils/rs Removed Files: ObjRS.class ObjRsMetaData.class Log Message: First pass at integration with Axis --- ObjRS.class DELETED --- --- ObjRsMetaData.class DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:55
|
Update of /cvsroot/idrs/Idrs/dev/net/sourceforge/idrs/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/net/sourceforge/idrs/utils Removed Files: ObjectStore.class DB.class Log Message: First pass at integration with Axis --- ObjectStore.class DELETED --- --- DB.class DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:17:54
|
Update of /cvsroot/idrs/Idrs/dev/net/sourceforge/idrs/script/embedable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/net/sourceforge/idrs/script/embedable Removed Files: IDRSScriptLanguage.class IDRSShell.class IDRSBeanShell.class IDRSJPython.class Log Message: First pass at integration with Axis --- IDRSScriptLanguage.class DELETED --- --- IDRSShell.class DELETED --- --- IDRSBeanShell.class DELETED --- --- IDRSJPython.class DELETED --- |
|
From: Marc B. <big...@us...> - 2004-08-22 05:15:16
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13606/src/net/sourceforge/idrs/axis Log Message: Directory /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/axis added to the repository |