More changes for the removal of the Axis dependencies.

Removed the log files created by the Windows INSTALL.

Corrected the "Author" for files created by Greg.

Tuned the ATS logs to be less chatty and have a greater backlog.

Updated the NOTICES file and added READMEs to provide information
about external packages included in the project.
This commit is contained in:
Juan Carlos Luciani 2007-03-17 06:39:46 +00:00
parent 33a49c686a
commit 7a44908936
26 changed files with 2650 additions and 2904 deletions

View File

@ -6,291 +6,15 @@
********************************************************************************
********************************************************************************
* Package: axis-1.4 *
* Package: xml-security-1_4_0 *
* *
* Supplier: The Apache Software Foundation http://www.apache.org/ *
********************************************************************************
Components from package included in project:
Components from package utilized in project:
axis-ant
axis
commons-discovery
commons-logging
jaxrpc
log4j
saaj
wsdl4j
Package license:
////////////////////////////////////////////////////////////////////////////////
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
////////////////////////////////////////////////////////////////////////////////
Package notice:
////////////////////////////////////////////////////////////////////////////////
=========================================================================
== NOTICE file corresponding to section 4(d) of the Apache License, ==
== Version 2.0, in this case for the Apache Axis distribution. ==
=========================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
////////////////////////////////////////////////////////////////////////////////
Component axis-ant license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component axis license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component commons-discovery license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component commons-logging license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component jaxrpc license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component log4j license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component saaj license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component wsdl4j license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
********************************************************************************
* Package: xml-security-1_2_1 *
* *
* Supplier: The Apache Software Foundation http://www.apache.org/ *
********************************************************************************
Components from package included in project:
commons-logging-api
xalan
xercesImpl
xml-apis
xmlsec
Package license:
@ -510,40 +234,16 @@ The development of this software was partly funded by the European
Commission in the <WebSig> project in the ISIS Programme.
////////////////////////////////////////////////////////////////////////////////
Component commons-logging-api license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component xalan license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component xercesImpl license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component xml-apis license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component xmlsec license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
********************************************************************************
* Package: wss4j-1.5 *
* Package: logging-log4j-1.2.14 *
* *
* Supplier: The Apache Software Foundation http://www.apache.org/ *
********************************************************************************
Components from package included in project:
Components from package utilized in project:
wss4j
log4j
Package license:
////////////////////////////////////////////////////////////////////////////////
@ -752,41 +452,10 @@ Package license:
Package notice:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
Component wss4j license in package:
////////////////////////////////////////////////////////////////////////////////
Not present.
////////////////////////////////////////////////////////////////////////////////
********************************************************************************
* File: Svc/src/com/novell/casa/authtoksvc/WSSecurity.java *
* *
* Supplier: http://www.novell.com/ *
********************************************************************************
This project file includes code copied from file WSSecurityUtil.java from
package org.apache.ws.security.util. The supplier of this package is the
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Copyright Notice for org.apache.ws.security.util.WSSecurityUtil.java:
////////////////////////////////////////////////////////////////////////////////
Copyright 2003-2006 The Apache Software Foundation, or their licensors, as
appropriate.
Licensed under the Apache License, Version 2.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.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
////////////////////////////////////////////////////////////////////////////////
********************************************************************************
* File: Svc/src/com/novell/casa/authtoksvc/Base64Coder.java *

View File

@ -1,25 +1,3 @@
The following describes the source of the files present in this folder.
axis-1_4 ----> axis-ant.jar
axis-1_4 ----> axis.jar
axis-1_4 ----> commons-discovery-0.2.jar
axis-1_4 ----> commons-logging-1.0.4.jar
xml-security-1_2_1 ----> commons-logging-api.jar
axis-1_4 ----> jaxrpc.jar
axis-1_4 ----> log4j-1.2.8.jar
axis-1_4 ----> log4j.properties
axis-1_4 ----> saaj.jar
axis-1_4 ----> wsdl4j-1.5.1.jar
wss4j-1.5 ----> wss4j-1.5.0.jar
xml-security-1_2_1 ----> xalan.jar
xml-security-1_2_1 ----> xercesImpl.jar
xml-security-1_2_1 ----> xml-apis.jar
xml-security-1_2_1 ----> xmlsec-1.2.1.jar
xml-security-1_2_1 - URL: http://xml.apache.org/security/dist/java-library/ - File: xml-security-bin-1_2_1.zip
axis-1_4 - URL: http://www.apache.org/dyn/closer.cgi/ws/axis/1_4 - File: axis-bin-1_4.tar.gz
wss4j-1.5 - URL: http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_5_0 - File: wss4j-bin-1.5.0.zip
This folder contains components which this project depends on.

View File

@ -26,7 +26,7 @@ DIST_SUBDIRS = logging-log4j-1.2.14
CFILES =
EXTRA_DIST =
EXTRA_DIST = README
.PHONY: package package-clean package-install package-uninstall
package package-clean package-install package-uninstall:

View File

@ -0,0 +1,8 @@
The files in this folder were downloaded from: http://www.apache.org/dist/logging/log4j/1.2.14/
Only the files necessary to satisfy the dependencies of this project were extracted from the
downloaded files.
The downloaded files are included in the project to improve maintenability. Use of these files
for any other purpose is discouraged, instead they should be obtained from apache.org.

View File

@ -26,7 +26,7 @@ DIST_SUBDIRS = xml-security-1_4_0
CFILES =
EXTRA_DIST =
EXTRA_DIST = README
.PHONY: package package-clean package-install package-uninstall
package package-clean package-install package-uninstall:

View File

@ -0,0 +1,11 @@
The files in this folder were downloaded from: http://www.apache.org/dist/xml/security/java-library/
Only the files necessary to satisfy the dependencies of this project were extracted from the
downloaded files.
The downloaded files are included in the project to improve maintenability. Use of these files
for any other purpose is discouraged, instead they should be obtained from apache.org.

View File

@ -27,6 +27,7 @@ DIST_SUBDIRS =
CFILES =
EXTRA_DIST = commons-logging.jar \
xercesImpl.jar \
xmlsec-1.4.0.jar
.PHONY: package package-clean package-install package-uninstall

View File

@ -12,14 +12,14 @@
#
# Root logger configuration.
#
log4j.rootLogger=info, DefaultAppender
log4j.rootLogger=warn, DefaultAppender
#
# DefaultAppender configuration.
#
log4j.appender.DefaultAppender=org.apache.log4j.RollingFileAppender
log4j.appender.DefaultAppender.File=/srv/www/casaats/logs/ats.log
log4j.appender.DefaultAppender.MaxFileSize=100KB
log4j.appender.DefaultAppender.MaxFileSize=300KB
log4j.appender.DefaultAppender.MaxBackupIndex=2
log4j.appender.DefaultAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DefaultAppender.layout.ConversionPattern=%d{ISO8601} %p %C{2} %m%n
@ -35,7 +35,7 @@ log4j.additivity.ATS_Trace=false
#
log4j.appender.TraceAppender=org.apache.log4j.RollingFileAppender
log4j.appender.TraceAppender.File=/srv/www/casaats/logs/ats.trace
log4j.appender.TraceAppender.MaxFileSize=100KB
log4j.appender.TraceAppender.MaxFileSize=300KB
log4j.appender.TraceAppender.MaxBackupIndex=2
log4j.appender.TraceAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.TraceAppender.layout.ConversionPattern=%d{ISO8601} %p [%x] %m%n

View File

@ -36,7 +36,7 @@ import org.apache.log4j.Logger;
/**
* AuthMechConfig Class.
* <p>
* This class obtains and maintains authentication token configuration.
* This class obtains and maintains configuration for authentication mechanisms.
*
*/
public final class AuthMechConfig
@ -106,7 +106,7 @@ public final class AuthMechConfig
}
catch (FileNotFoundException e)
{
m_log.warn("Constructor()- File " + mechSettingsFileName + " not found");
m_log.debug("Constructor()- File " + mechSettingsFileName + " not found");
throw new Exception("Constructor- File not found", e);
}
catch (IOException e)

View File

@ -176,7 +176,7 @@ public final class AuthTokenConfig
}
catch (FileNotFoundException e)
{
m_log.warn("Constructor()- File " + authTokenSettingsFileName + " not found");
m_log.debug("Constructor()- File " + authTokenSettingsFileName + " not found");
throw new Exception("AuthTokenConfig()- File not found", e);
}
catch (IOException e)

View File

@ -128,7 +128,7 @@ public final class EnabledSvcsConfig
}
catch (FileNotFoundException e)
{
m_log.warn("Constructor()- File " + configFolder + File.separator + m_authPolicyFileName + " not found");
m_log.debug("Constructor()- File " + configFolder + File.separator + m_authPolicyFileName + " not found");
}
catch (IOException e)
{

View File

@ -118,7 +118,7 @@ public final class IdenTokenConfig
}
catch (FileNotFoundException e)
{
m_log.warn("Constructor()- File " + idenTokenSettingsFileName + " not found");
m_log.debug("Constructor()- File " + idenTokenSettingsFileName + " not found");
throw new Exception("IdenTokenConfig()- File not found", e);
}
catch (IOException e)

View File

@ -176,7 +176,7 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable
}
catch (GSSException e)
{
m_log.warn("Constructor()- GSS Exception caught: " + e.getLocalizedMessage());
m_log.debug("Constructor()- GSS Exception caught: " + e.getLocalizedMessage());
throw new Exception("Failed to instantiate needed GSS objects", e);
}
}

View File

@ -12,14 +12,14 @@
#
# Root logger configuration.
#
log4j.rootLogger=info, DefaultAppender
log4j.rootLogger=warn, DefaultAppender
#
# DefaultAppender configuration.
#
log4j.appender.DefaultAppender=org.apache.log4j.RollingFileAppender
log4j.appender.DefaultAppender.File=ATS_INSTALL_DIRats\\catalinabase\\logs\\ats.log
log4j.appender.DefaultAppender.MaxFileSize=100KB
log4j.appender.DefaultAppender.MaxFileSize=300KB
log4j.appender.DefaultAppender.MaxBackupIndex=2
log4j.appender.DefaultAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DefaultAppender.layout.ConversionPattern=%d{ISO8601} %p %C{2} %m%n
@ -35,7 +35,7 @@ log4j.additivity.ATS_Trace=false
#
log4j.appender.TraceAppender=org.apache.log4j.RollingFileAppender
log4j.appender.TraceAppender.File=ATS_INSTALL_DIRats\\catalinabase\\logs\\ats.trace
log4j.appender.TraceAppender.MaxFileSize=100KB
log4j.appender.TraceAppender.MaxFileSize=300KB
log4j.appender.TraceAppender.MaxBackupIndex=2
log4j.appender.TraceAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.TraceAppender.layout.ConversionPattern=%d{ISO8601} %p [%x] %m%n

View File

@ -18,7 +18,7 @@
* To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.
*
* Author: Juan Carlos Luciani <jluciani@novell.com>
* Author: Greg Richardson <grichardson@novell.com>
*
***********************************************************************/
@ -50,8 +50,8 @@ public class ClientKeystoreSetup
int rc;
// debug stuff
File file;
FileWriter fw;
//File file;
//FileWriter fw;
public static void main(String[] args)
{
@ -66,8 +66,8 @@ public class ClientKeystoreSetup
try
{
// DEBUG STUFF
file = new File("c:\\test4.log");
fw = new FileWriter(file);
//file = new File("c:\\test4.log");
//fw = new FileWriter(file);
log("Here we go again: " + args.length);
for (int i = 0; i < args.length; i++)
@ -89,8 +89,8 @@ public class ClientKeystoreSetup
// DEBUG STUFF
log(rc);
fw.flush();
fw.close();
//fw.flush();
//fw.close();
// DEBUG STUFF
}
catch (IOException e)
@ -390,6 +390,7 @@ public class ClientKeystoreSetup
void log(String s)
{
/*
try
{
fw.write(this.getClass().getName() + ": " + s + "\r\n");
@ -397,6 +398,7 @@ public class ClientKeystoreSetup
catch (IOException ioe)
{
}
*/
}
}

View File

@ -1,3 +1,28 @@
/***********************************************************************
*
* Copyright (C) 2006 Novell, Inc. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, Novell, Inc.
*
* To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.
*
* Author: Greg Richardson <grichardson@novell.com>
*
***********************************************************************/
// CommandLauncher.cpp : Defines the entry point for the application.
//
@ -12,7 +37,7 @@
WCHAR ** G_rgArgs; // Command line arguments
int G_cArg; // Count of command line arguments
FILE * G_pf;
//FILE * G_pf;
// Forward declarations of functions included in this code module:
int processArguments(LPTSTR lpCmdLine);
@ -55,7 +80,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
int rc;
_wfopen_s(&G_pf, L"C:\\CommandLauncher.log", L"a+");
//_wfopen_s(&G_pf, L"C:\\CommandLauncher.log", L"a+");
// Process the command line
if (ERROR_NO_ERROR != (rc = processArguments(lpCmdLine)))
@ -67,9 +92,9 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
log(errorMessage(rc));
fwprintf(G_pf, L"CommandLauncher: return = %d\n", rc);
//fwprintf(G_pf, L"CommandLauncher: return = %d\n", rc);
fclose(G_pf);
//fclose(G_pf);
return rc;
}
@ -90,7 +115,7 @@ int processArguments(LPTSTR lpCmdLine)
int iKeyStart;
int iValueEnd;
fwprintf( G_pf, L"current command line = %s\n", lpCmdLine);
//fwprintf( G_pf, L"current command line = %s\n", lpCmdLine);
// Validate the command line
@ -396,10 +421,12 @@ int addArg(int iArg, LPTSTR lpString, int cChar)
void log(LPTSTR szMessage)
{
/*
LPTSTR szT = L"";
if (NULL == szMessage)
szMessage = szT;
fwprintf(G_pf, L"JavaLauncher: %s\n", szMessage);
*/
}
_TCHAR * errorMessage(int err)
@ -446,11 +473,11 @@ int executeCommand( int cArg, _TCHAR* rgArg[] )
int i; // Looping variable
int rc = ERROR_NO_ERROR; // Return code
fwprintf( G_pf, L"Arg count = %d\n", cArg);
for (i = 0; i < cArg; i++)
{
fwprintf(G_pf, L"rgArg[%d] (%s)\n", i, rgArg[i]);
}
//fwprintf( G_pf, L"Arg count = %d\n", cArg);
//for (i = 0; i < cArg; i++)
//{
// fwprintf(G_pf, L"rgArg[%d] (%s)\n", i, rgArg[i]);
//}
// exec the command
// if (-1 == _wexecv( rgArg[0], rgArg))
@ -494,6 +521,6 @@ int executeCommand( int cArg, _TCHAR* rgArg[] )
}
}
fwprintf(G_pf, L"ExecuteCommand returning %d\n", rc);
//fwprintf(G_pf, L"ExecuteCommand returning %d\n", rc);
return rc;
}

View File

@ -18,7 +18,7 @@
* To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.
*
* Author: Juan Carlos Luciani <jluciani@novell.com>
* Author: Greg Richardson <grichardson@novell.com>
*
***********************************************************************/
@ -44,7 +44,7 @@ public class DeleteFile
final static String FILE_KEY = "file=";
final static String FILTER_KEY = "filter=";
RandomAccessFile raf;
//RandomAccessFile raf;
int rc;
String sFile;
String sFilter;
@ -63,8 +63,8 @@ public class DeleteFile
try
{
raf = new RandomAccessFile(new File("c:\\test8.log"), "rw");
raf.seek(raf.length());
//raf = new RandomAccessFile(new File("c:\\test8.log"), "rw");
//raf.seek(raf.length());
// Process the arguments
if (ERROR_NO_ERROR == (rc = processArgs(args)))
@ -82,7 +82,7 @@ public class DeleteFile
try
{
log(rc);
raf.close();
//raf.close();
}
catch (Exception e1)
{
@ -365,6 +365,7 @@ public class DeleteFile
void log(String s)
{
/*
try
{
raf.writeUTF(this.getClass().getName() + ": " + s + "\r\n");
@ -372,5 +373,6 @@ public class DeleteFile
catch (IOException ioe)
{
}
*/
}
}

View File

@ -18,7 +18,7 @@
* To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.
*
* Author: Greg Richardson
* Author: Greg Richardson <grichardson@novell.com>
*
***********************************************************************/
@ -68,9 +68,9 @@ public class InitConfigFile
FileInputStream fisProperties;
File fileTemplate;
File fileOutput;
File file;
//File file;
//FileWriter fw;
RandomAccessFile raf;
//RandomAccessFile raf;
String[] rgsSearchFor;
String[] rgsReplaceWith;
String sInstallDir;
@ -97,11 +97,11 @@ public class InitConfigFile
try
{
file = new File("c:\\test.log");
//file = new File("c:\\test.log");
//fw = new FileWriter(file);
raf = new RandomAccessFile(file, "rw");
raf.seek(raf.length());
//raf = new RandomAccessFile(file, "rw");
//raf.seek(raf.length());
// Process the arguments
if (ERROR_NO_ERROR == (rc = processArgs(args)))
@ -112,7 +112,6 @@ public class InitConfigFile
rc = createOutputFile();
}
}
}
catch (IOException e)
{
@ -123,7 +122,7 @@ public class InitConfigFile
try
{
log(rc, " " + sOutput + "\n\n\n");
raf.close();
//raf.close();
}
catch (Exception e1)
{
@ -531,6 +530,7 @@ public class InitConfigFile
void log(String s)
{
/*
try
{
raf.writeUTF(this.getClass().getName() + ": " + s + "\r\n");
@ -538,5 +538,6 @@ public class InitConfigFile
catch (IOException ioe)
{
}
*/
}
}

View File

@ -48,8 +48,8 @@ public class MungeCryptoPropertiesFilePath
File fileInput;
File fileOutput;
File file;
FileWriter fw;
//File file;
//FileWriter fw;
String sInput;
String sOutput;
int rc;
@ -69,8 +69,8 @@ public class MungeCryptoPropertiesFilePath
try
{
file = new File("c:\\test5.log");
fw = new FileWriter(file);
//file = new File("c:\\test5.log");
//fw = new FileWriter(file);
log("Here we go: " + args.length);
for (int i = 0; i < args.length; i++)
@ -84,7 +84,6 @@ public class MungeCryptoPropertiesFilePath
// Process the file
rc = createOutputFile();
}
}
catch (IOException e)
{
@ -95,8 +94,8 @@ public class MungeCryptoPropertiesFilePath
try
{
log(rc);
fw.flush();
fw.close();
//fw.flush();
//fw.close();
}
catch (Exception e1)
{
@ -278,43 +277,33 @@ public class MungeCryptoPropertiesFilePath
case ERROR_INVALID_NUMBER_OF_PARAMS:
sMessage = "Invalid number of parameters: 2 expected";
break;
case ERROR_MISSING_INPUT_FILE:
sMessage = "Missing input file";
break;
case ERROR_OUTPUT_COPY_FAILED:
sMessage = "Unable to create output file";
break;
case ERROR_IO_EXCEPTION:
sMessage = "IOException";
break;
case ERROR_BAD_INPUT_FILE_PARAM:
sMessage = "Invalid input file parameter";
break;
case ERROR_BAD_OUTPUT_FILE_PARAM:
sMessage = "Invalid output file parameter";
break;
case ERROR_MISSING_INPUT_FILE_PARAM:
sMessage = "Missing input file parameter";
break;
case ERROR_MISSING_OUTPUT_FILE_PARAM:
sMessage = "Missing output file parameter";
break;
case ERROR_CANNOT_READ_FILE:
sMessage = "Cannot read file";
break;
case ERROR_CANNOT_CREATE_FILE:
sMessage = "Cannot create file";
break;
default:
sMessage = "Unknown error: " + err;
break;
@ -329,6 +318,7 @@ public class MungeCryptoPropertiesFilePath
void log(String s)
{
/*
try
{
fw.write(this.getClass().getName() + ": " + s + "\r\n");
@ -336,5 +326,6 @@ public class MungeCryptoPropertiesFilePath
catch (IOException ioe)
{
}
*/
}
}

View File

@ -18,7 +18,7 @@
* To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.
*
* Author: Juan Carlos Luciani <jluciani@novell.com>
* Author: Greg Richardson <grichardson@novell.com>
*
***********************************************************************/
@ -50,8 +50,8 @@ public class ServerKeystoreSetup
int rc;
// debug stuff
File file;
FileWriter fw;
//File file;
//FileWriter fw;
public static void main(String[] args)
{
@ -65,8 +65,8 @@ public class ServerKeystoreSetup
try
{
// DEBUG STUFF
file = new File("c:\\test2.log");
fw = new FileWriter(file);
//file = new File("c:\\test2.log");
//fw = new FileWriter(file);
// Process the input params
if (ERROR_NO_ERROR == (rc = processArgs(args)))
@ -81,8 +81,8 @@ public class ServerKeystoreSetup
// DEBUG STUFF
log(rc);
fw.flush();
fw.close();
//fw.flush();
//fw.close();
// DEBUG STUFF
}
catch (IOException e)
@ -396,6 +396,7 @@ public class ServerKeystoreSetup
void log(String s)
{
/*
try
{
fw.write(this.getClass().getName() + ": " + s + "\r\n");
@ -403,6 +404,7 @@ public class ServerKeystoreSetup
catch (IOException ioe)
{
}
*/
}
}

View File

@ -18,7 +18,7 @@
* To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.
*
* Author: Juan Carlos Luciani <jluciani@novell.com>
* Author: Greg Richardson <grichardson@novell.com>
*
***********************************************************************/
@ -54,8 +54,8 @@ public class SetupAsWindowsService
File fileProperties;
FileInputStream fisProperties;
File fileOutput;
File file;
FileWriter fw;
//File file;
//FileWriter fw;
String sInstallDir;
String sOutput;
int rc;
@ -77,8 +77,8 @@ public class SetupAsWindowsService
try
{
file = new File("c:\\test6.log");
fw = new FileWriter(file);
//file = new File("c:\\test6.log");
//fw = new FileWriter(file);
// Process the arguments
log("Process args");
@ -103,8 +103,8 @@ public class SetupAsWindowsService
try
{
log(rc);
fw.flush();
fw.close();
//fw.flush();
//fw.close();
}
catch (Exception e1)
{
@ -500,6 +500,7 @@ public class SetupAsWindowsService
void log(String s)
{
/*
try
{
fw.write(this.getClass().getName() + ": " + s + "\r\n");
@ -507,5 +508,6 @@ public class SetupAsWindowsService
catch (IOException ioe)
{
}
*/
}
}

View File

@ -18,7 +18,7 @@
* To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.
*
* Author: Juan Carlos Luciani <jluciani@novell.com>
* Author: Greg Richardson <grichardson@novell.com>
*
***********************************************************************/
@ -54,8 +54,8 @@ public class ShutdownWindowsService
File fileProperties;
FileInputStream fisProperties;
File fileOutput;
File file;
FileWriter fw;
//File file;
//FileWriter fw;
String sInstallDir;
String sOutput;
int rc;
@ -77,8 +77,8 @@ public class ShutdownWindowsService
try
{
file = new File("c:\\test7.log");
fw = new FileWriter(file);
//file = new File("c:\\test7.log");
//fw = new FileWriter(file);
// Process the arguments
if (ERROR_NO_ERROR == (rc = processArgs(args)))
@ -100,8 +100,8 @@ public class ShutdownWindowsService
try
{
log(rc);
fw.flush();
fw.close();
//fw.flush();
//fw.close();
}
catch (Exception e1)
{
@ -386,6 +386,7 @@ public class ShutdownWindowsService
void log(String s)
{
/*
try
{
fw.write(this.getClass().getName() + ": " + s + "\r\n");
@ -393,5 +394,6 @@ public class ShutdownWindowsService
catch (IOException ioe)
{
}
*/
}
}

View File

@ -18,7 +18,7 @@
* To contact Novell about this file by physical or electronic mail,
* you may find current contact information at www.novell.com.
*
* Author: Juan Carlos Luciani <jluciani@novell.com>
* Author: Greg Richardson <grichardson@novell.com>
*
***********************************************************************/
@ -58,8 +58,8 @@ public class UpdateWarFile
final static int ERROR_JFTEMPLATE_CLOSE_FAILED = -17;
String sInstallDir;
File file;
FileWriter fw;
//File file;
//FileWriter fw;
int rc;
public static void main(String[] args)
@ -74,8 +74,8 @@ public class UpdateWarFile
try
{
file = new File("c:\\test3.log");
fw = new FileWriter(file);
//file = new File("c:\\test3.log");
//fw = new FileWriter(file);
log("Here we go: " + args.length);
for (int i = 0; i < args.length; i++)
@ -99,8 +99,8 @@ public class UpdateWarFile
try
{
log(rc);
fw.flush();
fw.close();
//fw.flush();
//fw.close();
}
catch (Exception e1)
{
@ -427,6 +427,7 @@ public class UpdateWarFile
void log(String s)
{
/*
try
{
fw.write(this.getClass().getName() + ": " + s + "\r\n");
@ -434,5 +435,6 @@ public class UpdateWarFile
catch (IOException ioe)
{
}
*/
}
}

View File

@ -111,6 +111,12 @@
}
"Entry"
{
"MsmKey" = "8:_55AF3B67412A49E3A568102FDADDC2FE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_5B105FED430E4D998914B3562D4A8EA1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@ -958,7 +964,7 @@
"SourcePath" = "8:..\\..\\..\\Svc\\external\\xmlsec\\xml-security-1_4_0\\libs\\xercesImpl.jar"
"TargetName" = "8:xercesImpl.jar"
"Tag" = "8:"
"Folder" = "8:_516714B01FD34E218E009D96264F30AC"
"Folder" = "8:_7F0AE158BB53414DA5BB29F14E55EEBB"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@ -1113,6 +1119,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_55AF3B67412A49E3A568102FDADDC2FE"
{
"SourcePath" = "8:..\\..\\..\\Svc\\external\\xmlsec\\xml-security-1_4_0\\LICENSE"
"TargetName" = "8:LICENSE"
"Tag" = "8:"
"Folder" = "8:_7F0AE158BB53414DA5BB29F14E55EEBB"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5B105FED430E4D998914B3562D4A8EA1"
{
"SourcePath" = "8:..\\UpdateWarFile\\bin\\UpdateWarFile.class"
@ -1218,7 +1244,7 @@
"SourcePath" = "8:..\\..\\..\\Svc\\external\\xmlsec\\xml-security-1_4_0\\libs\\xmlsec-1.4.0.jar"
"TargetName" = "8:xmlsec-1.4.0.jar"
"Tag" = "8:"
"Folder" = "8:_516714B01FD34E218E009D96264F30AC"
"Folder" = "8:_7F0AE158BB53414DA5BB29F14E55EEBB"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@ -1278,7 +1304,7 @@
"SourcePath" = "8:..\\..\\..\\Svc\\external\\log4j\\logging-log4j-1.2.14\\dist\\lib\\log4j-1.2.14.jar"
"TargetName" = "8:log4j-1.2.14.jar"
"Tag" = "8:"
"Folder" = "8:_516714B01FD34E218E009D96264F30AC"
"Folder" = "8:_7F0AE158BB53414DA5BB29F14E55EEBB"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@ -1558,7 +1584,7 @@
"SourcePath" = "8:..\\..\\..\\Svc\\external\\xmlsec\\xml-security-1_4_0\\libs\\commons-logging.jar"
"TargetName" = "8:commons-logging.jar"
"Tag" = "8:"
"Folder" = "8:_516714B01FD34E218E009D96264F30AC"
"Folder" = "8:_7F0AE158BB53414DA5BB29F14E55EEBB"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@ -1828,6 +1854,28 @@
"Property" = "8:_168E54D12032489796CD7A843225EE70"
"Folders"
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_7638BAE158EC4759991B2FC04061FADC"
{
"Name" = "8:external"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Property" = "8:_E580B31319AE4C55BC31CFF84AF8C6AE"
"Folders"
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_7F0AE158BB53414DA5BB29F14E55EEBB"
{
"Name" = "8:apache.org"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Property" = "8:_B5D79599A831420BBDEBFD4FB0E2EA76"
"Folders"
{
}
}
}
}
}
}
"{9EF0B969-E518-4E46-987F-47570745A589}:_62B357DC6D484761A18291FA3525320C"