Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 182085 | Differences between
and this patch

Collapse All | Expand All

(-)src-native-new/makefile.win_em64t (-8 / +19 lines)
Lines 38-70 Link Here
38
38
39
39
40
package:
40
package:
41
	if exist packaging rm -rf packaging
41
	REM Add files that appear in the SDK only first, runtime files can be added after agntctrl.base.zip is created.
42
	md packaging\bin
42
	if not exist packaging\bin md packaging\bin
43
	md packaging\lib
43
	if not exist packaging\lib md packaging\lib
44
	md packaging\config
44
	md packaging\config
45
	md packaging\agents
45
	md packaging\agents
46
	md packaging\about_files
46
	md packaging\about_files
47
	
48
	REM Remove unwanted SWT files that were added by add-dependancies.agntctrl.sh when swt.jar was copied over
49
	rm -rf packaging/swt_licenses packaging/bin/swt*
47
50
48
	if exist $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll copy /y $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll packaging\bin
51
	if exist $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll copy /y $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll packaging\bin
49
	copy /y bin\*.dll packaging\bin
52
	copy /y bin\*.dll packaging\bin
50
	copy /y bin\readme.txt packaging\bin
53
	copy /y bin\readme.txt packaging\bin
51
	if exist $(TEMP_LICENSE_HOME)\epl-v10.html copy /y $(TEMP_LICENSE_HOME)\epl-v10.html packaging
52
	if exist $(TEMP_LICENSE_HOME)\notice.html copy /y $(TEMP_LICENSE_HOME)\notice.html packaging
53
	if exist $(XERCESC_HOME)\bin\xerces-c_2_6.dll copy /y $(XERCESC_HOME)\bin\xerces-c_2_6.dll packaging\bin
54
	if exist $(XERCESC_HOME)\bin\xerces-c_2_6.dll copy /y $(XERCESC_HOME)\bin\xerces-c_2_6.dll packaging\bin
54
	xcopy /y /E config packaging\config
55
	xcopy /y /E config packaging\config
55
	xcopy /y /E agents packaging\agents
56
	xcopy /y /E agents packaging\agents
56
	copy /y about.win.html packaging\about.html
57
	copy /y about.win.html packaging\about.html
57
	xcopy /y /E about_files packaging\about_files
58
	xcopy /y /E about_files packaging\about_files
58
59
60
	REM Create agntctrl.base.zip which will become the SDK after adding include and samples folders
61
	REM Certain files will have to be excluded as they should only be in the runtime but had to be added before creating the runtime.
59
	if exist agntctrl.base.win_em64t.zip  rm -f agntctrl.base.win_em64t.zip
62
	if exist agntctrl.base.win_em64t.zip  rm -f agntctrl.base.win_em64t.zip
60
	cd packaging
63
	cd packaging
61
	zip -r9 ..\agntctrl.base.win_em64t.zip *
64
	zip -r9 ..\agntctrl.base.win_em64t.zip * -x bin\/*.jar lib\/*.jar /plugins\/*
62
	cd ..
65
	cd ..
63
66
64
	rm -rf packaging
67
	REM Can now add runtime files that don't appear in the SDK
65
	md packaging\bin
68
	REM Files that were formally copied over from tptpdc
69
	md packaging\Resources
70
	md packaging\security
71
	copy /y packaging_md\windows\book.css packaging
72
	copy /y packaging_md\windows\getting_started.html packaging
73
	copy /y packaging_md\windows\bin\SetConfig.bat packaging\bin
74
	xcopy /y /E packaging_md\Resources packaging\Resources
75
	xcopy /y /E packaging_md\security packaging\security
66
76
67
	copy /y bin\*.exe packaging\bin
77
	copy /y bin\*.exe packaging\bin
78
	REM Create copies of the ACServer and ACService files for backwards compatibility
68
	copy /y bin\ACServer.exe packaging\bin\RAServer.exe
79
	copy /y bin\ACServer.exe packaging\bin\RAServer.exe
69
	copy /y bin\ACWinService.exe packaging\bin\RAService.exe
80
	copy /y bin\ACWinService.exe packaging\bin\RAService.exe
70
81
(-)src-native-new/makefile.win_ia32 (-8 / +17 lines)
Lines 29-37 Link Here
29
	cd ..\..\..\..
29
	cd ..\..\..\..
30
30
31
package:
31
package:
32
	if exist packaging rm -rf packaging
32
	REM Add files that appear in the SDK only first, runtime files can be added after agntctrl.base.zip is created.
33
	md packaging\bin
33
	if not exist packaging\bin md packaging\bin
34
	md packaging\lib
34
	if not exist packaging\lib md packaging\lib
35
	md packaging\config
35
	md packaging\config
36
	md packaging\agents
36
	md packaging\agents
37
	md packaging\about_files
37
	md packaging\about_files
Lines 39-61 Link Here
39
	if exist $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll copy /y $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll packaging\bin
39
	if exist $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll copy /y $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll packaging\bin
40
	copy /y bin\*.dll packaging\bin
40
	copy /y bin\*.dll packaging\bin
41
	copy /y bin\readme.txt packaging\bin
41
	copy /y bin\readme.txt packaging\bin
42
	if exist $(TEMP_LICENSE_HOME)\epl-v10.html copy /y $(TEMP_LICENSE_HOME)\epl-v10.html packaging
43
	if exist $(TEMP_LICENSE_HOME)\notice.html copy /y $(TEMP_LICENSE_HOME)\notice.html packaging
44
	if exist $(XERCESC_HOME)\bin\xerces-c_2_6.dll copy /y $(XERCESC_HOME)\bin\xerces-c_2_6.dll packaging\bin
42
	if exist $(XERCESC_HOME)\bin\xerces-c_2_6.dll copy /y $(XERCESC_HOME)\bin\xerces-c_2_6.dll packaging\bin
45
	xcopy /y /E config packaging\config
43
	xcopy /y /E config packaging\config
46
	xcopy /y /E agents packaging\agents
44
	xcopy /y /E agents packaging\agents
47
	copy /y about.win.html packaging\about.html
45
	copy /y about.win.html packaging\about.html
48
	xcopy /y /E about_files packaging\about_files
46
	xcopy /y /E about_files packaging\about_files
49
47
48
	REM Create agntctrl.base.zip which will become the SDK after adding include and samples folders
49
	REM Certain files will have to be excluded as they should only be in the runtime but had to be added before creating the runtime.
50
	if exist agntctrl.base.win_ia32.zip  rm -f agntctrl.base.win_ia32.zip
50
	if exist agntctrl.base.win_ia32.zip  rm -f agntctrl.base.win_ia32.zip
51
	cd packaging
51
	cd packaging
52
	zip -r9 ..\agntctrl.base.win_ia32.zip *
52
	zip -r9 ..\agntctrl.base.win_ia32.zip * -x bin\/*.jar lib\/*.jar /plugins\/* /swt_licenses\/* /bin\/swt*
53
	cd ..
53
	cd ..
54
54
55
	rm -rf packaging
55
	REM Can now add runtime files that don't appear in the SDK
56
	md packaging\bin
56
	REM Files that were formally copied over from tptpdc
57
	md packaging\Resources
58
	md packaging\security
59
	copy /y packaging_md\windows\book.css packaging
60
	copy /y packaging_md\windows\getting_started.html packaging
61
	copy /y packaging_md\windows\bin\SetConfig.bat packaging\bin
62
	xcopy /y /E packaging_md\Resources packaging\Resources
63
	xcopy /y /E packaging_md\security packaging\security
57
64
58
	copy /y bin\*.exe packaging\bin
65
	copy /y bin\*.exe packaging\bin
66
	
67
	REM Create copies of the ACServer and ACService files for backwards compatibility
59
	copy /y bin\ACServer.exe packaging\bin\RAServer.exe
68
	copy /y bin\ACServer.exe packaging\bin\RAServer.exe
60
	copy /y bin\ACWinService.exe packaging\bin\RAService.exe
69
	copy /y bin\ACWinService.exe packaging\bin\RAService.exe
61
70
(-)src-native-new/makefile (-12 / +31 lines)
Lines 76-92 Link Here
76
	cd ..
76
	cd ..
77
	
77
	
78
package:
78
package:
79
	rm -rf packaging
79
#	Note about the packing process.  Only files that should appear in the SDK should be added here.  Runtime files should be added after creating agntctrl.base.$(BUILD_PLATFORM).zip
80
	mkdir -p packaging/bin
80
	mkdir -p packaging/bin
81
	mkdir -p packaging/lib
81
	mkdir -p packaging/lib
82
83
	if [ -e packaging_md/plugins ]; then cp -r packaging_md/plugins packaging; \
84
	fi;
85
82
	if [ -e ${CBE_SDK_HOME}/lib/libcbe.so ]; then cp ${CBE_SDK_HOME}/lib/libcbe.so packaging/lib; \
86
	if [ -e ${CBE_SDK_HOME}/lib/libcbe.so ]; then cp ${CBE_SDK_HOME}/lib/libcbe.so packaging/lib; \
83
        fi;
87
        fi;
84
	if [ -e ${TEMP_LICENSE_HOME}/epl-v10.html ]; then cp ${TEMP_LICENSE_HOME}/epl-v10.html packaging; \
85
        fi;
86
	if [ -e ${TEMP_LICENSE_HOME}/notice.html ]; then cp ${TEMP_LICENSE_HOME}/notice.html packaging; \
87
        fi;
88
88
89
#	Some Solaris systems are unable to copy symbolic links, to work arround this, the files are zipped up and unzipped into the correct location.
89
#	Some Solaris systems are unable to copy symbolic links, to work around this, the files are zipped up and unzipped into the correct location.
90
ifeq ($(UNAME), SunOS)
90
ifeq ($(UNAME), SunOS)
91
	zip -qjy tmp.zip lib/lib*
91
	zip -qjy tmp.zip lib/lib*
92
	unzip -q tmp.zip -d packaging/lib
92
	unzip -q tmp.zip -d packaging/lib
Lines 113-125 Link Here
113
	if [ -e packaging/lib/libperflin.so ]; then rm -f packaging/lib/libperflin.*; fi;
113
	if [ -e packaging/lib/libperflin.so ]; then rm -f packaging/lib/libperflin.*; fi;
114
	if [ -e packaging/lib/librac.so ]; then rm -f packaging/lib/librac.*; fi;
114
	if [ -e packaging/lib/librac.so ]; then rm -f packaging/lib/librac.*; fi;
115
115
116
#	Create agntctrl.base.zip which will become the SDK after adding include and samples folders
117
#	Certain files will have to be excluded as they should only be in the runtime but had to be added before creating the runtime.
116
	rm -f agntctrl.base.$(BUILD_PLATFORM).zip
118
	rm -f agntctrl.base.$(BUILD_PLATFORM).zip
117
	cd packaging; \
119
	cd packaging; \
118
	zip -r9y ../agntctrl.base.$(BUILD_PLATFORM).zip *; \
120
	zip -r9y ../agntctrl.base.$(BUILD_PLATFORM).zip * -x bin/*.jar lib/*.jar /plugins/* /swt_licenses/* lib/libswt*; \
119
	cd ..
121
	cd ..
120
122
	
121
	rm -rf packaging
123
#	Files that will appear only in the runtime and not the SDK can now be added.
122
	mkdir -p packaging/bin
124
#	Copy about files into packaged zips.
125
	cp packaging_md/linux/getting_started.html packaging
126
	cp packaging_md/linux/book.css packaging
127
	cp -r packaging_md/Resources packaging
128
	cp -r packaging_md/security packaging
123
129
124
#	Some Solaris systems are unable to copy symbolic links, to work arround this, the files are zipped up and unzipped into the correct location.
130
#	Some Solaris systems are unable to copy symbolic links, to work arround this, the files are zipped up and unzipped into the correct location.
125
ifeq ($(UNAME), SunOS)
131
ifeq ($(UNAME), SunOS)
Lines 139-146 Link Here
139
145
140
	rm -f packaging/bin/ACStart-aix.sh packaging/bin/ACStop-aix.sh
146
	rm -f packaging/bin/ACStart-aix.sh packaging/bin/ACStop-aix.sh
141
	
147
	
142
	# TODO: localize the packaging process by performing symlinking and other final packaging steps here
148
# Create the symbolic links in the bin directory for RA* versions of the AC* files
143
149
# Links are created in the current directory then moved due since "cd packaging/bin; ln -s ./ACStart.sh RAStart.sh" doesn't create the links in packaging/bin for some reason.
150
	cp packaging/bin/ACServer packaging/bin/RAServer
151
	ln -s ./ACStart.sh RAStart.sh
152
	ln -s ./ACStop.sh RAStop.sh
153
	mv RAS* packaging/bin
154
155
# Add the SetConfig.sh to bin
156
	cp packaging_md/linux/bin/SetConfig.sh packaging/bin
157
158
# Remove swt libraries and licenses from non ia32 platforms
159
ifneq ($(BUILD_PLATFORM), linux_ia32)
160
	rm -rf packaging/swt_licenses packaging/lib/libswt*
161
endif
162
	
144
	cp agntctrl.base.$(BUILD_PLATFORM).zip  agntctrl.$(BUILD_PLATFORM).zip
163
	cp agntctrl.base.$(BUILD_PLATFORM).zip  agntctrl.$(BUILD_PLATFORM).zip
145
	cd packaging; \
164
	cd packaging; \
146
	zip -ur9y ../agntctrl.$(BUILD_PLATFORM).zip *; \
165
	zip -ur9y ../agntctrl.$(BUILD_PLATFORM).zip *; \
(-)src-native-new/packaging_md/security/generateKey.sh (+11 lines)
Added Link Here
1
#!/bin/sh
2
KEYTOOL=keytool
3
CERT=tptpSample.cer
4
KEYSTORE=tptpSamplekeystore
5
PASSWORD=password
6
7
rm -f $CERT
8
rm -f $KEYSTORE
9
	
10
$KEYTOOL -genkey -alias sample -keyalg RSA -sigalg MD5withRSA -dname "CN=Sample, OU=Sample, O=Sample, C=US" -validity 3650 -keypass $PASSWORD -storetype jks -keystore $KEYSTORE -storepass $PASSWORD
11
$KEYTOOL -export -alias sample -file $CERT -keystore $KEYSTORE -storepass $PASSWORD
(-)src-native-new/packaging_md/linux/bin/SetConfig.sh (+72 lines)
Added Link Here
1
#!/bin/sh
2
3
#
4
# Check if java is in the PATH
5
#
6
java -version > /dev/null 2>&1
7
if [ $? != 0 ]; then
8
	echo 'ERROR: Cannot find java in the PATH'
9
	echo 'RESOLUTION: Make sure the PATH environment variable contains the location of a java executable'
10
	exit 0
11
fi
12
13
14
if [ ! -s ../lib/config.jar ]; then
15
	echo 'ERROR:  Cannot find ..\lib\config.jar.'
16
	echo 'RESOLUTION: Make sure you are running this script in <AC>/bin directory.'
17
	exit 0
18
fi
19
20
#
21
# Check for com.ibm.icu in any /eclipse/plugins folders on the path
22
#
23
path_elements=`pwd | sed "s:/: :g"`
24
dir_path=""
25
for dir in $path_elements
26
do
27
	if [ -s $dir_path/$dir/plugins/com.ibm.icu_* ]
28
	then
29
		icu_prefix=$dir_path/$dir/plugins
30
		icu_name=`ls $icu_prefix | grep "com.ibm.icu_"`
31
		break
32
	else
33
		dir_path=$dir_path/$dir
34
	fi
35
done
36
37
if [ ! $icu_prefix ]
38
then
39
	echo 'ERROR:  Cannot find com.ibm.icu_<date>.jar.'
40
	echo 'RESOLUTION: Make sure you are running this script in <AC>/bin directory and that com.ibm.icu.<date>.jar exists.'
41
	exit 0
42
fi
43
44
#
45
# Check if the JRE contains a suitable JAXP
46
#
47
java -classpath $icu_prefix/$icu_name:../lib/config.jar org.eclipse.tptp.platform.agentcontroller.config.TestJAXP > /dev/null 2>&1
48
if [ $? != 0 ]; then
49
	echo 'ERROR: The Java Runtime in use does not contain a suitable JAXP feature'
50
	echo 'RESOLUTION: Use a JRE which supports the JAXP feature'
51
	exit 0
52
fi
53
54
#
55
# Generate the configuration files
56
#
57
java -classpath $icu_prefix/$icu_name:../lib/config.jar:../lib/config.nl1.jar:../lib/config.nl2.jar:../lib/config.nl2a.jar org.eclipse.tptp.platform.agentcontroller.config.SetConfig $*
58
59
#
60
# Change the owner of ChkPass so that Agent Controller does not need root access for authenticating user passwords
61
#
62
RAC_SECURED=`grep -c '<Security ' ../config/serviceconfig.xml`
63
AC_SECURED=`grep -c '<SecurityEnabled>true' ../config/serviceconfig.xml`
64
SECURED=`expr $RAC_SECURED + $AC_SECURED`
65
if [ $SECURED = "0" ]; then
66
	echo
67
else
68
	echo
69
	echo 'Agent Controller has been configured for security.'
70
	echo 'Please enter root password to enable that security:'
71
	su root -c "chown root ChkPass;chmod +s ChkPass"
72
fi
(-)src-native-new/packaging_md/security/generateKey.bat (+24 lines)
Added Link Here
1
@rem *********************************************************************
2
@rem Copyright (c) 2006, 2008 IBM Corporation and others.
3
@rem All rights reserved.   This program and the accompanying materials
4
@rem are made available under the terms of the Eclipse Public License v1.0
5
@rem which accompanies this distribution, and is available at
6
@rem http://www.eclipse.org/legal/epl-v10.html
7
@rem $Id: generateKey.bat,v 1.2 2008/02/29 14:23:39 jkubasta Exp $
8
@rem
9
@rem Contributors:
10
@rem IBM - Initial API and implementation
11
@rem *********************************************************************
12
@rem
13
@setlocal
14
@set KEYTOOL=keytool
15
@set CERT=tptpSample.cer
16
@set KEYSTORE=tptpSamplekeystore
17
@set PASSWORD=password
18
19
@del /f %CERT%
20
@del /f %KEYSTORE%
21
	
22
%KEYTOOL% -genkey -alias sample -keyalg RSA -sigalg MD5withRSA -dname "CN=Sample, OU=Sample, O=Sample, C=US" -validity 3650 -keypass %PASSWORD% -storetype jks -keystore %KEYSTORE% -storepass %PASSWORD%
23
%KEYTOOL% -export -alias sample -file %CERT% -keystore %KEYSTORE% -storepass %PASSWORD%
24
@endlocal
(-)src-native-new/packaging_md/windows/bin/SetConfig.bat (+79 lines)
Added Link Here
1
@rem *********************************************************************
2
@rem Copyright (c) 2005, 2009 IBM Corporation and others.
3
@rem All rights reserved.   This program and the accompanying materials
4
@rem are made available under the terms of the Eclipse Public License v1.0
5
@rem which accompanies this distribution, and is available at
6
@rem http://www.eclipse.org/legal/epl-v10.html
7
@rem $Id: SetConfig.bat,v 1.10 2009/04/17 01:34:10 jcayne Exp $
8
@rem
9
@rem Contributors:
10
@rem IBM - Initial API and implementation
11
@rem *********************************************************************
12
@rem
13
@REM
14
@REM Check if java is in the PATH
15
@REM
16
@java -version > nul 2>&1
17
@IF ERRORLEVEL 1 GOTO ERROR_JAVA_NOT_FOUND
18
19
@REM
20
@REM Check if the script is run in <AC>/bin directory.
21
@REM
22
@if not exist ..\lib\config.jar GOTO ERROR_CONFIG_NOT_FOUND
23
24
25
@REM
26
@REM Find com.ibm.icu_<date>.jar if it's under an eclipse/plugins folder shared by the working dir.
27
@REM
28
29
@SET PREV_DIR=%CD%
30
@PUSHD ..
31
32
:DIR_SEARCH
33
@if exist plugins\com.ibm.icu_* (
34
CD plugins
35
@SET PREFIX=%CD%\plugins
36
@FOR /F "tokens=*" %%G IN ('DIR /b com.ibm.icu_*') DO @SET JAR_NAME=%%G
37
@POPD
38
@GOTO ASSIGN_CLASS
39
)
40
@CD ..
41
@IF "%CD%" EQU "%PREV_DIR%" (
42
@POPD
43
@GOTO DIR_SEARCH_ERROR
44
)
45
@SET PREV_DIR=%CD%
46
@GOTO DIR_SEARCH
47
48
:ASSIGN_CLASS
49
@REM Check if the JRE contains a suitable JAXP
50
@java -classpath "%PREFIX%"\%JAR_NAME%;..\lib\config.jar org.eclipse.tptp.platform.agentcontroller.config.TestJAXP > nul 2>&1
51
@IF ERRORLEVEL 1 GOTO ERROR_JAXP_NOT_SUPPORTED
52
53
@REM
54
@REM Generate the configuration files
55
@REM
56
@java -classpath "%PREFIX%"\%JAR_NAME%;..\lib\config.jar;..\lib\config.nl1.jar;..\lib\config.nl2.jar;..\lib\config.nl2a.jar org.eclipse.tptp.platform.agentcontroller.config.SetConfig %*
57
@goto END
58
59
:ERROR_JAVA_NOT_FOUND
60
@echo "ERROR: Cannot find java in the PATH"
61
@echo "RESOLUTION: Make sure the PATH environment variable contains the location of a java executable"
62
@goto END
63
64
:ERROR_CONFIG_NOT_FOUND
65
@echo "ERROR:  Cannot find ..\lib\config.jar."
66
@echo "RESOLUTION: Make sure you are running this script in <AC>/bin directory."
67
@goto END
68
69
:ERROR_JAXP_NOT_SUPPORTED
70
@echo "ERROR: The Java Runtime in use does not contain a suitable JAXP feature"
71
@echo "RESOLUTION: Use a JRE which supports the JAXP feature"
72
@goto END
73
74
:DIR_SEARCH_ERROR
75
@ECHO "ERROR: Cannot find com.ibm.icu_<date>.jar."
76
@ECHO "RESOLUTION: Make sure you are running this script in <AC>/bin directory and that com.ibm.icu.<date>.jar exists in a eclipse/plugins dir higer than current dir."
77
@GOTO END
78
79
:END
(-)src-native-new/packaging_md/Resources/filters.txt (+9 lines)
Added Link Here
1
java*                *  EXCLUDE
2
sun*                 *  EXCLUDE
3
com.sun.*            *  EXCLUDE
4
com.ibm.*            *  EXCLUDE
5
org.eclipse.*        *  EXCLUDE
6
org.apache.*         *  EXCLUDE
7
org.w3c.*            *  EXCLUDE
8
org.xml.*            *  EXCLUDE
9
javax.xml.parsers.*  *  EXCLUDE
(-)src-native-new/packaging_md/Resources/jvmpi.pro (+37 lines)
Added Link Here
1
*
2
* This is the profile file for the JvmPI Agent
3
* Use this file to control the information content that is collected
4
* All lines starting with an "*" are comment lines
5
*
6
*
7
************************************************************************************************************************************
8
* Global Options
9
* These options must be set at Agent startup before any tracing has begun.
10
* Please refer to \logging\agents\profiling_agent\doc\JvmProfilingAgent.htm for details.
11
************************************************************************************************************************************
12
13
14
**********************************
15
* Global Options - DEFAULT VALUE
16
**********************************
17
CLASS_LOAD_DETAILS			= false
18
CONTEXT_FLOW				= false
19
EXCEPTION_TRACING 			= false
20
FILTERS					= true
21
GC					= default
22
ID_STYLE				= static
23
OPTIONS					= true
24
TIMESTAMPS				= true
25
UNREFERENCED_SYMBOLS			= false
26
27
***********************************
28
* Global Options - INTERFACE VALUE
29
***********************************
30
31
COLLATION_VALUES                        = false
32
METHOD_COUNTS                           = false
33
OBJ_ALLOC_IS_ARRAY                      = true
34
OBJ_REF_MODE                            = filterOwner
35
STACK_INFORMATION                       = contiguous
36
TICKET                                  = true
37
TRACE_IDREFS                            = false

Return to bug 182085