diff options
author | Mathias Bauer <mba@openoffice.org> | 2009-11-11 07:25:37 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2009-11-11 07:25:37 +0100 |
commit | da0f3ac4cad7eec9912506fcceb360d466a9623f (patch) | |
tree | 4a2d9d56c52d0f375cd4d72fc50347a6a1ce4b5d | |
parent | 231206a8fc806525ac1787c0fd6683e09b9aa95f (diff) |
#i103496#: sandbox removed
23 files changed, 21 insertions, 24 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk index d48817b51a6c..c1909a807863 100755 --- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk +++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk @@ -39,7 +39,7 @@ PACKAGE = org$/openoffice$/java$/accessibility .INCLUDE : settings.mk JAVADIR = $(OUT)$/misc$/java -JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar +JARFILES = jurt.jar unoil.jar ridl.jar JAVAFILES = \ logging$/XAccessibleEventLog.java \ logging$/XAccessibleHypertextLog.java \ diff --git a/accessibility/workben/makefile.in b/accessibility/workben/makefile.in index ad97448e7780..d81df5fb7363 100644 --- a/accessibility/workben/makefile.in +++ b/accessibility/workben/makefile.in @@ -11,7 +11,6 @@ CLASS_FILES = $(patsubst %.java, %.class, $(JAVAFILES)) CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\ $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\ $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\ - $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\ $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\ $(PATH_SEPARATOR)$(OUT_COMP_JAVA)\ $(PATH_SEPARATOR).\ diff --git a/accessibility/workben/makefile.mk b/accessibility/workben/makefile.mk index 33c1e2a0ef5e..7f19d8936757 100644 --- a/accessibility/workben/makefile.mk +++ b/accessibility/workben/makefile.mk @@ -15,7 +15,6 @@ JAR_PATH = $(SOLARBINDIR)$/ JAR_FILES = \ unoil.jar \ - sandbox.jar \ ridl.jar \ jurt.jar \ juh.jar \ diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common index 3b7262a8489d..5bb567414220 100644 --- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common +++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common @@ -56,7 +56,7 @@ # #************************************************************************* -JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar +JARFILES = jurt.jar unoil.jar ridl.jar JAVAFILES = \ CanvasShape.java \ Canvas.java \ diff --git a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk index eb744d465cfb..032a75b16d04 100644 --- a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk +++ b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk @@ -68,7 +68,7 @@ USE_JAVAVER:=TRUE .INCLUDE : settings.mk .IF "$(JAVAVER:s/.//)" >= "140" -JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar +JARFILES = jurt.jar unoil.jar ridl.jar .INCLUDE : makefile.common diff --git a/accessibility/workben/org/openoffice/accessibility/awb/manifest b/accessibility/workben/org/openoffice/accessibility/awb/manifest index 951f9ec3128f..36111c54081d 100644 --- a/accessibility/workben/org/openoffice/accessibility/awb/manifest +++ b/accessibility/workben/org/openoffice/accessibility/awb/manifest @@ -1,3 +1,3 @@ Manifest-Version: 1.0 Main-Class: org.openoffice.accessibility.awb.AccessibilityWorkBench -Class-Path: classes.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar +Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common index 7a0813b099db..6b32a5db09a8 100644 --- a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common +++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common @@ -56,7 +56,7 @@ # #************************************************************************* -JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar +JARFILES = jurt.jar unoil.jar ridl.jar JAVAFILES = \ AccessibilityModel.java \ AccessibilityNode.java \ diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common index d4929e3f1cd8..4f5f99ed0cf1 100644 --- a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common +++ b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common @@ -56,7 +56,7 @@ # #************************************************************************* -JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar +JARFILES = jurt.jar unoil.jar ridl.jar JAVAFILES = \ ComponentView.java \ ContextView.java \ diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common index 32655a0c6a6f..e3303bb6890f 100644 --- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common +++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common @@ -56,7 +56,7 @@ # #************************************************************************* -JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar +JARFILES = jurt.jar unoil.jar ridl.jar JAVAFILES = \ CaretSpinnerModel.java \ TextActionDialog.java \ diff --git a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common index d06336e12c56..f2462a88f841 100644 --- a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common +++ b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common @@ -56,7 +56,7 @@ # #************************************************************************* -JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar +JARFILES = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar JAVAFILES = \ AccessibleEventMulticaster.java \ InformationWriter.java \ diff --git a/bean/qa/complex/makefile.mk b/bean/qa/complex/makefile.mk index dbf6e8362e1b..4fb1ce0ea8b2 100644 --- a/bean/qa/complex/makefile.mk +++ b/bean/qa/complex/makefile.mk @@ -38,7 +38,7 @@ PACKAGE = complex #----- compile .java files ----------------------------------------- -JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = OOoBeanTest.java ScreenComparer.java WriterFrame.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/bean/test/applet/oooapplet/makefile.mk b/bean/test/applet/oooapplet/makefile.mk index 5056e0bbb4c6..8abfe7131aed 100644 --- a/bean/test/applet/oooapplet/makefile.mk +++ b/bean/test/applet/oooapplet/makefile.mk @@ -38,7 +38,7 @@ PACKAGE = oooapplet #----- compile .java files ----------------------------------------- -JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar +JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar JAVAFILES = OOoViewer.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/bean/test/makefile.mk b/bean/test/makefile.mk index f214fe4f24cc..5a29c4b1033c 100644 --- a/bean/test/makefile.mk +++ b/bean/test/makefile.mk @@ -38,7 +38,7 @@ PACKAGE = test #----- compile .java files ----------------------------------------- -JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar +JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar JAVAFILES = Test.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/forms/qa/complex/forms/makefile.mk b/forms/qa/complex/forms/makefile.mk index 7333c58e2381..2ed9c6a512d8 100755 --- a/forms/qa/complex/forms/makefile.mk +++ b/forms/qa/complex/forms/makefile.mk @@ -40,7 +40,7 @@ PACKAGE = complex$/forms #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar JAVAFILES = CheckOGroupBoxModel.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk index 375476c9c4af..2cd9dcabf182 100644 --- a/wizards/com/sun/star/wizards/agenda/makefile.mk +++ b/wizards/com/sun/star/wizards/agenda/makefile.mk @@ -42,7 +42,6 @@ PACKAGE = com$/sun$/star$/wizards$/agenda JARFILES= unoil.jar \ jurt.jar \ ridl.jar \ - sandbox.jar \ juh.jar \ java_uno.jar \ java_uno_accessbridge \ @@ -73,4 +72,4 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) # --- Targets ------------------------------------------------------ -.INCLUDE : target.mk
\ No newline at end of file +.INCLUDE : target.mk diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk index 66e56132d6ab..0e1b9e17be63 100644 --- a/wizards/com/sun/star/wizards/fax/makefile.mk +++ b/wizards/com/sun/star/wizards/fax/makefile.mk @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/fax .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk index 1853e0844fe8..2237ac207759 100644 --- a/wizards/com/sun/star/wizards/form/makefile.mk +++ b/wizards/com/sun/star/wizards/form/makefile.mk @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/form .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF JARCLASSDIRS = com$/sun$/star$/wizards$/form diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk index f7cfcfe5c160..d845f6456efb 100644 --- a/wizards/com/sun/star/wizards/table/makefile.mk +++ b/wizards/com/sun/star/wizards/table/makefile.mk @@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/wizards$/table .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF JARCLASSDIRS = com$/sun$/star$/wizards$/table diff --git a/xmlsecurity/tools/demo/makefile.mk b/xmlsecurity/tools/demo/makefile.mk index 9789bd93ee97..41f80da9c8ad 100644 --- a/xmlsecurity/tools/demo/makefile.mk +++ b/xmlsecurity/tools/demo/makefile.mk @@ -125,7 +125,7 @@ APP5OBJS= $(OBJ)$/util.obj $(OBJ)$/performance.obj # ---------- jflatfilter ---------- # PACKAGE= com$/sun$/star$/xml$/security$/eval -JARFILES= sandbox.jar ridl.jar jurt.jar unoil.jar juh.jar +JARFILES= ridl.jar jurt.jar unoil.jar juh.jar JAVAFILES:= $(shell @ls *.java) JAVACLASSFILES= $(CLASSDIR)$/$(PACKAGE)$/JavaFlatFilter.class JARCLASSDIRS= $(PACKAGE) diff --git a/xmlsecurity/tools/examples/uno_win.bat b/xmlsecurity/tools/examples/uno_win.bat index 606ced6f5caf..6d1f74ada1f6 100644 --- a/xmlsecurity/tools/examples/uno_win.bat +++ b/xmlsecurity/tools/examples/uno_win.bat @@ -18,6 +18,6 @@ echo ============================================= @echo on cp %WS_PATH%/xmlsecurity/tools/uno/current.gif ./. -java -classpath %WS_PATH%/xmlsecurity/%OUTPUTDIR%/class;%SO_CLASSPATHPATH%/rt.jar;%SO_CLASSPATHPATH%/java_uno.jar;%SO_CLASSPATHPATH%/sandbox.jar;%SO_CLASSPATHPATH%/jurt.jar;%SO_CLASSPATHPATH%/unoil.jar;%SO_CLASSPATHPATH%/ridl.jar;%SO_CLASSPATHPATH%/juh.jar com.sun.star.xml.security.uno.TestTool %WS_PATH%/xmlsecurity/tools/cryptoken/jks/testToken.jks "" +java -classpath %WS_PATH%/xmlsecurity/%OUTPUTDIR%/class;%SO_CLASSPATHPATH%/rt.jar;%SO_CLASSPATHPATH%/java_uno.jar;%SO_CLASSPATHPATH%/jurt.jar;%SO_CLASSPATHPATH%/unoil.jar;%SO_CLASSPATHPATH%/ridl.jar;%SO_CLASSPATHPATH%/juh.jar com.sun.star.xml.security.uno.TestTool %WS_PATH%/xmlsecurity/tools/cryptoken/jks/testToken.jks "" rm ./current.gif diff --git a/xmlsecurity/tools/standalone/csfit/util/makefile.mk b/xmlsecurity/tools/standalone/csfit/util/makefile.mk index e25f42e7ce49..3ac85f910f8d 100644 --- a/xmlsecurity/tools/standalone/csfit/util/makefile.mk +++ b/xmlsecurity/tools/standalone/csfit/util/makefile.mk @@ -107,7 +107,7 @@ REGISTERJARS=\ # xsec_jxsec.jar # jar-files, which regcomp needs so that it can use java -REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar sandbox.jar jurt.jar juh.jar +REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar # CLASSPATH, which regcomp needs to be run # $(SOLARLIBDIR) needs to be included in case Java components are registered, diff --git a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk index 399522e90bdf..3c1d17b7ecd1 100644 --- a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk +++ b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk @@ -107,7 +107,7 @@ REGISTERJARS=\ # xsec_jxsec.jar # jar-files, which regcomp needs so that it can use java -REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar sandbox.jar jurt.jar juh.jar +REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar # CLASSPATH, which regcomp needs to be run # $(SOLARLIBDIR) needs to be included in case Java components are registered, diff --git a/xmlsecurity/tools/uno/makefile.mk b/xmlsecurity/tools/uno/makefile.mk index 34c47ad2c166..3f3da61e57d6 100644 --- a/xmlsecurity/tools/uno/makefile.mk +++ b/xmlsecurity/tools/uno/makefile.mk @@ -41,7 +41,7 @@ USE_JAVAVER:=TRUE .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/target.pmk -JARFILES = java_uno.jar sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar +JARFILES = java_uno.jar jurt.jar unoil.jar ridl.jar juh.jar JAVAFILES := $(shell @ls *.java) JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) |