#99053# change CLASSPATH

5 files changed, 57 insertions, 61 deletions

diff --git a/odk/examples/java/Inspector/Makefile b/odk/examples/java/Inspector/Makefile
index d7dc716ab24e..4d9e464433be 100644
--- a/odk/examples/java/Inspector/Makefile
+++ b/odk/examples/java/Inspector/Makefile
@@ -37,19 +37,18 @@ CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES) )
 
 CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES) )
 
-DK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
-		$(CLASSES_DIR)$(PS)jurt.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\
+SDK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
+		$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\
 		$(PATH_SEPARATOR)$(OUT_COMPONENT)\
 		)
 
 OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
-OFFICE_CLASSPATH = $(subst \\,\,$(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes,$(DK_CLASSPATH)))
 
 
 # Targets
@@ -69,7 +68,7 @@ $(TYPEFLAG) : $(IDLFILES)
 	@echo bla > $@
 
 $(JAVAFLAG) : $(OUT_COMPONENT) $(TYPEFLAG) $(JAVAFILES)
-	javac -classpath "$(DK_CLASSPATH)" -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
+	javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
 	@echo bla > $@
 
 $(COMPONENTJARFLAG) : $(JAVAFLAG)
@@ -80,8 +79,8 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG)
 $(REGISTERFLAG) : $(COMPONENTJARFLAG)
 ifneq "$(OFFICE_PROGRAM_PATH)" ""
 	$(BIN_DIR)$(PS)regmerge "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" /UCR $(GENURDFILES)
-	$(COPY) $(COMPONENT_JAR) "$(OFFICE_PROGRAM_PATH)/classes"
-	java -classpath "$(OFFICE_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/InstanceInspector.jar" com.sun.star.loader.Java2
+	$(COPY) $(COMPONENT_JAR) "$(OFFICE_CLASSES_DIR)"
+	java -classpath "$(SDK_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/InstanceInspector.jar" com.sun.star.loader.Java2
 	@echo bla > $@
 else
 	@echo --------------------------------------------------------------------------------
@@ -93,5 +92,5 @@ endif
 register: $(REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
 	@echo Please use the following command to execute
-	@echo java -classpath $(subst \\,\,$(DK_CLASSPATH)) Test $(OSEP)Connection$(CSEP)
+	@echo java -classpath $(subst \\,\,$(SDK_CLASSPATH)) Test $(OSEP)Connection$(CSEP)
 	@echo --------------------------------------------------------------------------------
diff --git a/odk/examples/java/MinimalComponent/Makefile b/odk/examples/java/MinimalComponent/Makefile
index d388f98584df..75fc525cae1c 100644
--- a/odk/examples/java/MinimalComponent/Makefile
+++ b/odk/examples/java/MinimalComponent/Makefile
@@ -37,19 +37,18 @@ CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES) )
 
 CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES) )
 
-DK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),, \
-		$(CLASSES_DIR)$(PS)jurt.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\
+SDK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),, \
+		$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\
 		$(PATH_SEPARATOR)$(OUT_COMPONENT) \
 		)
 
 OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
-OFFICE_CLASSPATH = $(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes, $(DK_CLASSPATH))
 
 
 # Targets
@@ -69,7 +68,7 @@ $(TYPEFLAG) : $(IDLFILES)
 	@echo bla > $@
 
 $(JAVAFLAG) : $(OUT_COMPONENT) $(TYPEFLAG) $(JAVAFILES)
-	javac -classpath $(DK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
+	javac -classpath $(SDK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
 	@echo bla > $@
 
 $(COMPONENTJARFLAG) : $(JAVAFLAG)
@@ -80,8 +79,8 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG)
 $(REGISTERFLAG) : $(COMPONENTJARFLAG)
 ifneq "$(OFFICE_PROGRAM_PATH)" ""
 	$(BIN_DIR)$(PS)regmerge $(OFFICE_PROGRAM_PATH)$(PS)applicat.rdb /UCR $(GENURDFILES) MinimalComponent.rdb
-	$(COPY) $(COMPONENT_JAR) $(OFFICE_PROGRAM_PATH)$(PS)classes
-	java -classpath $(OFFICE_CLASSPATH) com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/MinimalComponent.jar" com.sun.star.loader.Java2
+	$(COPY) $(COMPONENT_JAR) "$(OFFICE_CLASSES_DIR)"
+	java -classpath $(SDK_CLASSPATH) com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/MinimalComponent.jar" com.sun.star.loader.Java2
 	@echo bla > $@
 else
 	@echo --------------------------------------------------------------------------------
@@ -93,7 +92,7 @@ endif
 register: $(REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
 	@echo Please use the following command to execute
-	@echo java -classpath $(DK_CLASSPATH) TestMinimalComponent
+	@echo java -classpath $(SDK_CLASSPATH) TestMinimalComponent
 	@echo --------------------------------------------------------------------------------
 
 run:
diff --git a/odk/examples/java/NotesAccess/Makefile b/odk/examples/java/NotesAccess/Makefile
index 371158c9014a..4707d9d47d5b 100644
--- a/odk/examples/java/NotesAccess/Makefile
+++ b/odk/examples/java/NotesAccess/Makefile
@@ -12,16 +12,16 @@ include $(SETTINGS)/std.mk
 
 JAVAFILES  = \
 	NotesAccess.java
-		
+
 CLASSFILES = $(patsubst %.java,$(OUT_CLASS)$(PS)%.class,$(JAVAFILES))
 
-DK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
-		$(CLASSES_DIR)$(PS)jurt.jar \
-  		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar \
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar \
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar \
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar \
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)Notes.jar \
+SDK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
+		$(OFFICE_CLASSES_DIR)$(PS)jurt.jar \
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar \
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar \
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar \
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar \
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)Notes.jar \
 		$(PATH_SEPARATOR)$(OUT_CLASS)\
 		)
 
@@ -29,14 +29,14 @@ DK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
 # Targets
 .PHONY: ALL
 ALL : notesaccess
-	
+
 include $(SETTINGS)/stdtarget.mk
 
 $(CLASSFILES) : $(OUT) $(OUT_CLASS) $(JAVAFILES)
-	javac -classpath $(DK_CLASSPATH) -d $(OUT_CLASS) $(JAVAFILES) 
+	javac -classpath $(SDK_CLASSPATH) -d $(OUT_CLASS) $(JAVAFILES) 
 
 notesaccess: $(CLASSFILES)
 	@echo --------------------------------------------------------------------------------
 	@echo Please use the following command to execute
-	@echo java -classpath $(subst \\,\,$(DK_CLASSPATH)) NotesAccess $(OSEP)Connection$(CSEP) $(OSEP)Host$(CSEP) $(OSEP)User$(CSEP) $(OSEP)Password$(CSEP) $(OSEP)Database$(CSEP)
+	@echo java -classpath $(subst \\,\,$(SDK_CLASSPATH)) NotesAccess $(OSEP)Connection$(CSEP) $(OSEP)Host$(CSEP) $(OSEP)User$(CSEP) $(OSEP)Password$(CSEP) $(OSEP)Database$(CSEP)
 	@echo --------------------------------------------------------------------------------
diff --git a/odk/examples/java/PropertySet/Makefile b/odk/examples/java/PropertySet/Makefile
index 323efc229123..1b0852073fef 100644
--- a/odk/examples/java/PropertySet/Makefile
+++ b/odk/examples/java/PropertySet/Makefile
@@ -24,19 +24,18 @@ JAVAFILES  =	PropTest.java
 
 CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(JAVAFILES))
 
-DK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
-		$(CLASSES_DIR)$(PS)jurt.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\
+SDK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
+		$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\
 		$(PATH_SEPARATOR)$(OUT_COMPONENT)\
 		)
 
 OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
-OFFICE_CLASSPATH = $(subst \\,\,$(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes,$(DK_CLASSPATH)))
 
 
 # Targets
@@ -49,7 +48,7 @@ $(OUT_COMPONENT) : $(OUT)
 	$(MKDIR) $@
 
 $(CLASSFILES) : $(OUT_COMPONENT) $(JAVAFILES)
-	javac -classpath "$(DK_CLASSPATH)" -d $(OUT_COMPONENT) $(JAVAFILES) 
+	javac -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMPONENT) $(JAVAFILES) 
 
 $(COMPONENTJARFLAG) : $(CLASSFILES)
 	jar cvfm $(COMPONENT_JAR) $(COMPONENT_MANIFESTFILE) -C $(OUT_COMPONENT) .
@@ -58,8 +57,8 @@ $(COMPONENTJARFLAG) : $(CLASSFILES)
 
 $(REGISTERFLAG) : $(COMPONENTJARFLAG)
 ifneq "$(OFFICE_PROGRAM_PATH)" ""
-	$(COPY) $(COMPONENT_JAR) "$(OFFICE_PROGRAM_PATH)/classes"
-	java -classpath "$(OFFICE_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/PropTest.jar" com.sun.star.loader.Java2
+	$(COPY) $(COMPONENT_JAR) "$(OFFICE_CLASSES_DIR)"
+	java -classpath "$(SDK_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/PropTest.jar" com.sun.star.loader.Java2
 	@echo bla > $@
 else
 	@echo ----------------------------------------------------------------------------------------
diff --git a/odk/examples/java/ToDo/Makefile b/odk/examples/java/ToDo/Makefile
index 33266907ab3e..00f018af0244 100644
--- a/odk/examples/java/ToDo/Makefile
+++ b/odk/examples/java/ToDo/Makefile
@@ -36,19 +36,18 @@ CLASSFILES = $(patsubst %.java,$(OUT_COMPONENT)$(PS)%.class,$(JAVAFILES))
 
 CLASSFILES += $(patsubst %.java,$(OUT_COMPONENT)$(PS)$(PACKAGE)$(PS)%.class,$(GENJAVAFILES))
 
-DK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
-		$(CLASSES_DIR)$(PS)jurt.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)unoil.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)ridl.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)sandbox.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)java_uno.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)juh.jar\
-		$(PATH_SEPARATOR)$(CLASSES_DIR)$(PS)jut.jar\
+SDK_CLASSPATH =	$(subst $(EMPTYSTRING) $(EMPTYSTRING),,\
+		$(OFFICE_CLASSES_DIR)$(PS)jurt.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)unoil.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)ridl.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)sandbox.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)java_uno.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)juh.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)$(PS)jut.jar\
 		$(PATH_SEPARATOR)$(OUT_COMPONENT)\
 		)
 
 OFFICE_FILEURL = $(subst \,/,$(OFFICE_PROGRAM_PATH))
-OFFICE_CLASSPATH = $(subst \\,\,$(subst $(CLASSES_DIR),$(OFFICE_PROGRAM_PATH)$(PS)classes,$(DK_CLASSPATH)))
 
 
 # Targets
@@ -68,7 +67,7 @@ $(TYPEFLAG) : $(IDLFILES)
 	@echo bla > $@
 
 $(JAVAFLAG) : $(OUT_COMPONENT) $(TYPEFLAG) $(JAVAFILES)
-	javac -classpath $(DK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
+	javac -classpath $(SDK_CLASSPATH) -d $(OUT_COMPONENT) $(GENJAVAFILES) $(JAVAFILES)
 	@echo bla > $@
 
 $(COMPONENTJARFLAG) : $(JAVAFLAG)
@@ -79,8 +78,8 @@ $(COMPONENTJARFLAG) : $(JAVAFLAG)
 $(REGISTERFLAG) : $(COMPONENTJARFLAG)
 ifneq "$(OFFICE_PROGRAM_PATH)" ""
 	$(BIN_DIR)$(PS)regmerge "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" /UCR $(GENURDFILES)
-	$(COPY) $(COMPONENT_JAR) "$(OFFICE_PROGRAM_PATH)/classes"
-	java -classpath "$(OFFICE_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/ToDo.jar" com.sun.star.loader.Java2
+	$(COPY) $(COMPONENT_JAR) "$(OFFICE_CLASSES_DIR)"
+	java -classpath "$(SDK_CLASSPATH)" com.sun.star.tools.uno.RegComp "$(URLPREFIX)$(OFFICE_FILEURL)/applicat.rdb" register "$(URLPREFIX)$(OFFICE_FILEURL)/classes/ToDo.jar" com.sun.star.loader.Java2
 	@echo bla > $@
 else
 	@echo --------------------------------------------------------------------------------