You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ka...@apache.org on 2007/05/04 13:28:28 UTC

svn commit: r535179 - in /webservices/rampart/tags/c/0.90/c: INSTALL build/win32/configure.in build/win32/deploy_rampart.bat build/win32/make_bin_dist.bat build/win32/makefile samples/client/sec_echo/deploy_client_repo.bat

Author: kaushalye
Date: Fri May  4 04:28:27 2007
New Revision: 535179

URL: http://svn.apache.org/viewvc?view=rev&rev=535179
Log:
Sync with trunk

Modified:
    webservices/rampart/tags/c/0.90/c/INSTALL
    webservices/rampart/tags/c/0.90/c/build/win32/configure.in
    webservices/rampart/tags/c/0.90/c/build/win32/deploy_rampart.bat
    webservices/rampart/tags/c/0.90/c/build/win32/make_bin_dist.bat
    webservices/rampart/tags/c/0.90/c/build/win32/makefile
    webservices/rampart/tags/c/0.90/c/samples/client/sec_echo/deploy_client_repo.bat

Modified: webservices/rampart/tags/c/0.90/c/INSTALL
URL: http://svn.apache.org/viewvc/webservices/rampart/tags/c/0.90/c/INSTALL?view=diff&rev=535179&r1=535178&r2=535179
==============================================================================
--- webservices/rampart/tags/c/0.90/c/INSTALL (original)
+++ webservices/rampart/tags/c/0.90/c/INSTALL Fri May  4 04:28:27 2007
@@ -40,7 +40,11 @@
 
 2. Extract the source package and build the source.
 	Unzip the source package.
-	Go to the root of the distribution.
+	Go to the "build\win32" directory of the distribution.
+	Set the parameters of the configure.in
+		AXIS2_BIN_DIR = <path/to/where/you/have/installed/axis2>
+		OPENSSL_BIN_DIR = <path/to/where/you/have/installed/openssl>
+		DEBUG = <1 if enabled, 0 otherwise>
 	Run "nmake install"
 
 3. Engage Rampart/C with Axis2/C as described in the "Engaging Rampart/C with axis2/C" section.

Modified: webservices/rampart/tags/c/0.90/c/build/win32/configure.in
URL: http://svn.apache.org/viewvc/webservices/rampart/tags/c/0.90/c/build/win32/configure.in?view=diff&rev=535179&r1=535178&r2=535179
==============================================================================
--- webservices/rampart/tags/c/0.90/c/build/win32/configure.in (original)
+++ webservices/rampart/tags/c/0.90/c/build/win32/configure.in Fri May  4 04:28:27 2007
@@ -1,6 +1,8 @@
-AXIS2_BIN_DIR = E:\axis2c-bin-1.0.0-win32
-OPENSSL_BIN_DIR = E:\OpenSSL
+AXIS2_BIN_DIR = D:\axis2c-bin-1.0.0-win32
+OPENSSL_BIN_DIR = D:\OpenSSL
 DEBUG = 1
-
+MAJOR_VER = 0
+MINOR_VER = 90
+PATCH_VER =
 
 

Modified: webservices/rampart/tags/c/0.90/c/build/win32/deploy_rampart.bat
URL: http://svn.apache.org/viewvc/webservices/rampart/tags/c/0.90/c/build/win32/deploy_rampart.bat?view=diff&rev=535179&r1=535178&r2=535179
==============================================================================
--- webservices/rampart/tags/c/0.90/c/build/win32/deploy_rampart.bat (original)
+++ webservices/rampart/tags/c/0.90/c/build/win32/deploy_rampart.bat Fri May  4 04:28:27 2007
@@ -1,6 +1,6 @@
 md %AXIS2C_HOME%\modules\rampart\
-copy rampart\mod_rampart.dll %AXIS2C_HOME%\modules\rampart\
-copy rampart\module.xml %AXIS2C_HOME%\modules\rampart\
+copy modules\rampart\mod_rampart.dll %AXIS2C_HOME%\modules\rampart\
+copy modules\rampart\module.xml %AXIS2C_HOME%\modules\rampart\
 
 md %AXIS2C_HOME%\services\sec_echo\
 copy bin\samples\services\sec_echo\sec_echo.dll %AXIS2C_HOME%\services\sec_echo\
@@ -18,4 +18,4 @@
 copy bin\samples\callback\pwcb.dll %AXIS2C_HOME%\bin\samples\rampart\callback\
 
 md %AXIS2C_HOME%\bin\samples\rampart\credential_provider
-copy bin\samples\credential_provider\cred_provider.dll %AXIS2C_HOME%\bin\samples\rampart\cred_provider\
\ No newline at end of file
+copy bin\samples\credential_provider\cred_provider.dll %AXIS2C_HOME%\bin\samples\rampart\credential_provider\
\ No newline at end of file

Modified: webservices/rampart/tags/c/0.90/c/build/win32/make_bin_dist.bat
URL: http://svn.apache.org/viewvc/webservices/rampart/tags/c/0.90/c/build/win32/make_bin_dist.bat?view=diff&rev=535179&r1=535178&r2=535179
==============================================================================
--- webservices/rampart/tags/c/0.90/c/build/win32/make_bin_dist.bat (original)
+++ webservices/rampart/tags/c/0.90/c/build/win32/make_bin_dist.bat Fri May  4 04:28:27 2007
@@ -1,10 +1,18 @@
-set BINDIST=..\rampart-bin-0.90-win32
+set BINDIST=..\rampartc-bin-0.90-win32
 if exist %BINDIST% rd /s /q %BINDIST%
 mkdir %BINDIST%
 mkdir %BINDIST%\samples
 mkdir %BINDIST%\modules
 mkdir %BINDIST%\include
 
-xcopy /E /I /Y .\bin\samples\* %BINDIST%\samples\
-xcopy /E /I /Y .\modules\* %BINDIST%\modules\
-xcopy /E /I /Y .\include\* %BINDIST%\include\
+xcopy /E /I /Y .\bin\samples\*.* %BINDIST%\samples\
+xcopy /E /I /Y .\modules\*.* %BINDIST%\modules\
+xcopy /E /I /Y .\include\*.* %BINDIST%\include\
+
+xcopy README %BINDIST%
+xcopy INSTALL %BINDIST%
+xcopy AUTHORS %BINDIST%
+xcopy COPYING %BINDIST%
+xcopy LICENCE %BINDIST%
+xcopy NEWS %BINDIST%
+xcopy NOTICE %BINDIST%

Modified: webservices/rampart/tags/c/0.90/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/rampart/tags/c/0.90/c/build/win32/makefile?view=diff&rev=535179&r1=535178&r2=535179
==============================================================================
--- webservices/rampart/tags/c/0.90/c/build/win32/makefile (original)
+++ webservices/rampart/tags/c/0.90/c/build/win32/makefile Fri May  4 04:28:27 2007
@@ -6,8 +6,8 @@
 RAMPART_SOURCE_DIR = ..\..\
 
 RAMPART_INTDIR = .\int.msvc
-RAMPART_DIST_NAME = .\..\rampart-$(MAJOR_VER).$(MINOR_VER)
-#RAMPART_DISTDIR = .\..\rampart
+RAMPART_DIST_NAME = .\..\rampartc-$(MAJOR_VER).$(MINOR_VER)
+#RAMPART_DISTDIR = .\..\rampartc
 RAMPART_DISTDIR = $(RAMPART_DIST_NAME)
 
 #rampart module
@@ -146,7 +146,6 @@
 
 mod_rampart_copy_include:
 	xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\include $(RAMPART_DISTDIR)\include
-	copy $(RAMPART_SOURCE_DIR)\README $(RAMPART_DISTDIR)\
 
 mod_rampart_copy_keys:
 	if not exist $(RAMPART_DISTDIR)\bin\samples\keys mkdir $(RAMPART_DISTDIR)\bin\samples\keys
@@ -156,11 +155,21 @@
 	copy deploy_rampart.bat $(RAMPART_DISTDIR)
 
 copy_sec_policy:
-	xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\secpolicy $(RAMPART_DISTDIR)\bin\samples\sec_policy
+	xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\secpolicy $(RAMPART_DISTDIR)\bin\samples\secpolicy
+
+copy_dist_files:
+	copy $(RAMPART_SOURCE_DIR)\README $(RAMPART_DISTDIR)
+	copy $(RAMPART_SOURCE_DIR)\INSTALL $(RAMPART_DISTDIR)
+	copy $(RAMPART_SOURCE_DIR)\AUTHORS $(RAMPART_DISTDIR)
+	copy $(RAMPART_SOURCE_DIR)\COPYING $(RAMPART_DISTDIR)
+	copy $(RAMPART_SOURCE_DIR)\LICENSE $(RAMPART_DISTDIR)
+	copy $(RAMPART_SOURCE_DIR)\NEWS $(RAMPART_DISTDIR)
+	copy $(RAMPART_SOURCE_DIR)\NOTICE $(RAMPART_DISTDIR)
+
 
 #copy make_bin_dist.bat $(RAMPART_DISTDIR)
 
-mod_rampart_all: mod_rampart mod_rampart_authn mod_rampart_pwcb mod_rampart_htpwcb mod_rampart_samples mod_rampart_copy_include
+mod_rampart_all: mod_rampart mod_rampart_authn mod_rampart_pwcb mod_rampart_htpwcb mod_rampart_samples mod_rampart_copy_include copy_dist_files
 
 mv_dist:
 	move $(RAMPART_DISTDIR) $(RAMPART_DIST_NAME)
@@ -170,7 +179,7 @@
 	del /s *.am
 	chdir .\..\win32
 
-dist: clean distdir intdirs mod_rampart mod_rampart_pwcb mod_rampart_authn mod_rampart_services_sec_echo mod_rampart_samples_sec_echo mod_rampart_samples_credential_provider mod_rampart_copy_deploy copy_sec_policy mod_rampart_copy_include mod_rampart_copy_keys del_am
+dist: clean distdir intdirs mod_rampart mod_rampart_pwcb mod_rampart_authn mod_rampart_services_sec_echo mod_rampart_samples_sec_echo mod_rampart_samples_credential_provider mod_rampart_copy_deploy copy_sec_policy mod_rampart_copy_include copy_dist_files mod_rampart_copy_keys del_am
 
 deploy:
 	chdir $(RAMPART_DISTDIR)

Modified: webservices/rampart/tags/c/0.90/c/samples/client/sec_echo/deploy_client_repo.bat
URL: http://svn.apache.org/viewvc/webservices/rampart/tags/c/0.90/c/samples/client/sec_echo/deploy_client_repo.bat?view=diff&rev=535179&r1=535178&r2=535179
==============================================================================
--- webservices/rampart/tags/c/0.90/c/samples/client/sec_echo/deploy_client_repo.bat (original)
+++ webservices/rampart/tags/c/0.90/c/samples/client/sec_echo/deploy_client_repo.bat Fri May  4 04:28:27 2007
@@ -1,7 +1,7 @@
 echo off
 
 rem if your client repository is different, change the value.
-set CLIENT_REPO=%AXIS2C_HOME%\clientrepo
+set CLIENT_REPO=%AXIS2C_HOME%\client_repo
 
 echo Start creating a client repository at %CLIENT_REPO%
 
@@ -14,7 +14,7 @@
 
 
 @echo Copying axis2.xml to client_repo
-copy /Y ".\data\client.enc.axis2.xml" "%CLIENT_REPO%\axis2.xml"
+copy /Y ".\data\client.axis2.xml" "%CLIENT_REPO%\axis2.xml"
 
 @echo Copying libraries to client_repo
 xcopy /S/I/Q/Y "%AXIS2C_HOME%\lib" "%CLIENT_REPO%\lib"