diff --git a/build_plugins b/build_plugins index a067ab762..481bb4d1b 100755 --- a/build_plugins +++ b/build_plugins @@ -275,8 +275,6 @@ do_ant() echo "Copying created jar file into $DISTDIR..." cp jar/*aist*.jar ../$DISTDIR cp jar/*aist*.jar ../$JARDIR - cp jar/org.iso*.jar ../$DISTDIR - cp jar/org.iso*.jar ../$JARDIR cd .. else echo "Project: $project does not exist" diff --git a/jp.go.aist.rtm.nameserviceview/.classpath b/jp.go.aist.rtm.nameserviceview/.classpath index 6eed102b8..efcae34db 100644 --- a/jp.go.aist.rtm.nameserviceview/.classpath +++ b/jp.go.aist.rtm.nameserviceview/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/jp.go.aist.rtm.nameserviceview/.settings/org.eclipse.jdt.core.prefs b/jp.go.aist.rtm.nameserviceview/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index e38140122..000000000 --- a/jp.go.aist.rtm.nameserviceview/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -#Fri Jan 18 10:39:22 JST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/jp.go.aist.rtm.nameserviceview/lib/jakarta.transaction-api-2.0.1.jar b/jp.go.aist.rtm.nameserviceview/lib/jakarta.transaction-api-2.0.1.jar new file mode 100644 index 000000000..b1e7da4be Binary files /dev/null and b/jp.go.aist.rtm.nameserviceview/lib/jakarta.transaction-api-2.0.1.jar differ diff --git a/jp.go.aist.rtm.nameserviceview/lib/openjdk-orb-10.1.1.Final.jar b/jp.go.aist.rtm.nameserviceview/lib/openjdk-orb-10.1.1.Final.jar new file mode 100644 index 000000000..ce093bb1f Binary files /dev/null and b/jp.go.aist.rtm.nameserviceview/lib/openjdk-orb-10.1.1.Final.jar differ diff --git a/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/corba/NameServerAccesser.java b/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/corba/NameServerAccesser.java index ccc972661..cd4fa69d3 100644 --- a/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/corba/NameServerAccesser.java +++ b/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/corba/NameServerAccesser.java @@ -3,9 +3,6 @@ import java.util.ArrayList; import java.util.List; -import jp.go.aist.rtm.nameserviceview.manager.NameServiceViewPreferenceManager; -import jp.go.aist.rtm.toolscommon.corba.CorbaUtil; - import org.omg.CosNaming.Binding; import org.omg.CosNaming.NameComponent; import org.omg.CosNaming.NamingContext; @@ -13,6 +10,8 @@ import org.omg.CosNaming.NamingContextExtHelper; import RTM.ManagerHelper; +import jp.go.aist.rtm.nameserviceview.manager.NameServiceViewPreferenceManager; +import jp.go.aist.rtm.toolscommon.corba.CorbaUtil; /** * ネームサーバにアクセスするユーティリティ CORBA専用のクラスである diff --git a/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog/ShowIORDialog.java b/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog/ShowIORDialog.java index 6adabc46f..52f3ca073 100644 --- a/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog/ShowIORDialog.java +++ b/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/dialog/ShowIORDialog.java @@ -1,5 +1,6 @@ package jp.go.aist.rtm.nameserviceview.ui.dialog; +import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; @@ -43,7 +44,12 @@ protected Control createDialogArea(Composite parent) { createComposite(mainComposite); return mainComposite; } - + + @Override + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.OK_ID, "Close", true); + } + private void createComposite(Composite mainComposite) { Composite composite = new Composite(mainComposite, SWT.NONE); GridLayout gl = new GridLayout(2, false); diff --git a/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/views/nameserviceview/NameServiceView.java b/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/views/nameserviceview/NameServiceView.java index 3d9a73d9b..1a0805cba 100644 --- a/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/views/nameserviceview/NameServiceView.java +++ b/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/ui/views/nameserviceview/NameServiceView.java @@ -29,7 +29,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.DrillDownAdapter; import org.eclipse.ui.part.ViewPart; -import org.eclipse.ui.views.navigator.LocalSelectionTransfer; +import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.ui.views.properties.IPropertySheetPage; import jp.go.aist.rtm.nameserviceview.NameServiceViewPlugin; @@ -69,7 +69,7 @@ public void createPartControl(Composite parent) { getViewSite().setSelectionProvider(viewer); viewer.addDragSupport(DND.DROP_COPY | DND.DROP_MOVE, - new Transfer[] { LocalSelectionTransfer.getInstance() }, + new Transfer[] { LocalSelectionTransfer.getTransfer() }, new DragSourceAdapter() { @Override public void dragStart(DragSourceEvent event) { @@ -84,7 +84,7 @@ public void dragSetData(DragSourceEvent event) { .getSelection()); event.data = structuredSelection; - LocalSelectionTransfer.getInstance().setSelection( + LocalSelectionTransfer.getTransfer().setSelection( structuredSelection); super.dragSetData(event); diff --git a/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/util/NameServiceProcessHandler.java b/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/util/NameServiceProcessHandler.java index 0ec95c891..c559fc964 100644 --- a/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/util/NameServiceProcessHandler.java +++ b/jp.go.aist.rtm.nameserviceview/src/jp/go/aist/rtm/nameserviceview/util/NameServiceProcessHandler.java @@ -74,7 +74,7 @@ public static String searchCommand(String target) { BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); result = reader.readLine(); } catch (IOException e) { - e.printStackTrace(); +// e.printStackTrace(); } return result; } diff --git a/jp.go.aist.rtm.repositoryView/.classpath b/jp.go.aist.rtm.repositoryView/.classpath index 57f3440b8..8dd3fc3ff 100644 --- a/jp.go.aist.rtm.repositoryView/.classpath +++ b/jp.go.aist.rtm.repositoryView/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/jp.go.aist.rtm.repositoryView/.settings/org.eclipse.jdt.core.prefs b/jp.go.aist.rtm.repositoryView/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index 39824ecc4..000000000 --- a/jp.go.aist.rtm.repositoryView/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -#Fri May 16 15:41:43 JST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/views/RepositoryView.java b/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/views/RepositoryView.java index f073b65d1..813674771 100644 --- a/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/views/RepositoryView.java +++ b/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/views/RepositoryView.java @@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.part.DrillDownAdapter; -import org.eclipse.ui.views.navigator.LocalSelectionTransfer; +import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -82,7 +82,7 @@ public void createPartControl(Composite parent) { hookContextMenu(); viewer.addDragSupport(DND.DROP_COPY | DND.DROP_MOVE, - new Transfer[] { LocalSelectionTransfer.getInstance() }, + new Transfer[] { LocalSelectionTransfer.getTransfer() }, new DragSourceAdapter() { @Override public void dragStart(DragSourceEvent event) { @@ -97,7 +97,7 @@ public void dragSetData(DragSourceEvent event) { .getSelection()); event.data = structuredSelection; - LocalSelectionTransfer.getInstance().setSelection( + LocalSelectionTransfer.getTransfer().setSelection( structuredSelection); super.dragSetData(event); diff --git a/jp.go.aist.rtm.rtcbuilder.lua/.settings/org.eclipse.jdt.core.prefs b/jp.go.aist.rtm.rtcbuilder.lua/.settings/org.eclipse.jdt.core.prefs index f42de363a..396292939 100644 --- a/jp.go.aist.rtm.rtcbuilder.lua/.settings/org.eclipse.jdt.core.prefs +++ b/jp.go.aist.rtm.rtcbuilder.lua/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,4 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/jp.go.aist.rtm.systemeditor/.classpath b/jp.go.aist.rtm.systemeditor/.classpath index e2b688a87..ad3149ea0 100644 --- a/jp.go.aist.rtm.systemeditor/.classpath +++ b/jp.go.aist.rtm.systemeditor/.classpath @@ -1,5 +1,7 @@ + + diff --git a/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF b/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF index 43b0bfb57..fe2bd2508 100644 --- a/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF +++ b/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF @@ -22,7 +22,9 @@ Bundle-ClassPath: ., lib/jackson-annotations-2.10.2.jar, lib/jackson-core-2.10.2.jar, lib/jackson-databind-2.10.2.jar, - lib/commons-csv-1.8.jar + lib/commons-csv-1.8.jar, + lib/jakarta.transaction-api-2.0.1.jar, + lib/openjdk-orb-10.1.1.Final.jar Export-Package: influent, jp.go.aist.rtm.systemeditor, jp.go.aist.rtm.systemeditor._debug, diff --git a/jp.go.aist.rtm.systemeditor/build.properties b/jp.go.aist.rtm.systemeditor/build.properties index ed2c319ef..c500250d5 100644 --- a/jp.go.aist.rtm.systemeditor/build.properties +++ b/jp.go.aist.rtm.systemeditor/build.properties @@ -17,7 +17,9 @@ bin.includes = META-INF/,\ lib/jackson-annotations-2.10.2.jar,\ lib/jackson-core-2.10.2.jar,\ lib/jackson-databind-2.10.2.jar,\ - lib/commons-csv-1.8.jar + lib/commons-csv-1.8.jar,\ + lib/jakarta.transaction-api-2.0.1.jar,\ + lib/openjdk-orb-10.1.1.Final.jar src.includes = lib/,\ COPYRIGHT,\ NOTICE.txt,\ diff --git a/jp.go.aist.rtm.systemeditor/lib/jakarta.transaction-api-2.0.1.jar b/jp.go.aist.rtm.systemeditor/lib/jakarta.transaction-api-2.0.1.jar new file mode 100644 index 000000000..b1e7da4be Binary files /dev/null and b/jp.go.aist.rtm.systemeditor/lib/jakarta.transaction-api-2.0.1.jar differ diff --git a/jp.go.aist.rtm.systemeditor/lib/openjdk-orb-10.1.1.Final.jar b/jp.go.aist.rtm.systemeditor/lib/openjdk-orb-10.1.1.Final.jar new file mode 100644 index 000000000..ce093bb1f Binary files /dev/null and b/jp.go.aist.rtm.systemeditor/lib/openjdk-orb-10.1.1.Final.jar differ diff --git a/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java b/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java index 98d23aa69..dfbe46c3d 100644 --- a/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java +++ b/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java @@ -22,7 +22,9 @@ import java.util.Iterator; import java.util.List; +import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import org.eclipse.core.resources.IFile; @@ -84,8 +86,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl; - import jp.go.aist.rtm.systemeditor.RTSystemEditorPlugin; import jp.go.aist.rtm.systemeditor.extension.SaveProfileExtension; import jp.go.aist.rtm.systemeditor.factory.ProfileSaver; @@ -384,9 +384,13 @@ public void doSave(IProgressMonitor monitor) { boolean isReplace = dialog.isReplace(); getSystemDiagram().setSystemId(dialog.getSystemId()); - XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar()); - calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED); - getSystemDiagram().setUpdateDate(calendar.toString()); + try { + XMLGregorianCalendar calendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(); + calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED); + getSystemDiagram().setUpdateDate(calendar.toString()); + } catch (DatatypeConfigurationException e1) { + e1.printStackTrace(); + } // TODO バージョンアップログへの対応 @@ -432,10 +436,14 @@ public void doSaveAs() { boolean isReplace = dialog.isReplace(); getSystemDiagram().setSystemId(dialog.getSystemId()); - XMLGregorianCalendar calendar = new XMLGregorianCalendarImpl(new GregorianCalendar()); - calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED); - getSystemDiagram().setCreationDate(calendar.toString()); - getSystemDiagram().setUpdateDate(calendar.toString()); + try { + XMLGregorianCalendar calendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(); + calendar.setMillisecond(DatatypeConstants.FIELD_UNDEFINED); + getSystemDiagram().setCreationDate(calendar.toString()); + getSystemDiagram().setUpdateDate(calendar.toString()); + } catch (DatatypeConfigurationException e1) { + e1.printStackTrace(); + } // TODO バージョンアップログへの対応 diff --git a/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/direct/NameDirectEditManager.java b/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/direct/NameDirectEditManager.java index 775ed6e2e..45935161d 100644 --- a/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/direct/NameDirectEditManager.java +++ b/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/editpart/direct/NameDirectEditManager.java @@ -13,7 +13,7 @@ public class NameDirectEditManager extends DirectEditManager { public NameDirectEditManager(GraphicalEditPart source, Class editorType, CellEditorLocator locator) { - super(source, editorType, locator); + super(source, (Class)editorType, locator); this.model = source.getModel(); } diff --git a/jp.go.aist.rtm.toolscommon.profiles/.classpath b/jp.go.aist.rtm.toolscommon.profiles/.classpath index be694e48a..84dc429b6 100644 --- a/jp.go.aist.rtm.toolscommon.profiles/.classpath +++ b/jp.go.aist.rtm.toolscommon.profiles/.classpath @@ -3,7 +3,14 @@ - + + + + + + + + @@ -11,8 +18,5 @@ - - - diff --git a/jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF b/jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF index fe9497ac3..6a02a7248 100644 --- a/jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF +++ b/jp.go.aist.rtm.toolscommon.profiles/META-INF/MANIFEST.MF @@ -12,12 +12,19 @@ Bundle-ClassPath: ., lib/logback-core-1.1.3.jar, schema/, lib/jyaml-1.3.jar, - lib/jaxb-impl.jar, + lib/istack-commons-runtime-3.0.7.jar, + lib/javax.activation-api-1.2.0.jar, + lib/jaxb-api-2.3.1.jar, + lib/jaxb-runtime-2.3.1.jar, + lib/jackson-databind-2.9.5.jar, lib/jackson-annotations-2.9.5.jar, lib/jackson-core-2.9.5.jar, - lib/jackson-databind-2.9.5.jar + lib/stax-api-1.0-2.jar Bundle-Vendor: %providerName Bundle-Localization: plugin +Import-Package: javax.xml.stream;version="1.0.2", + javax.xml.stream.events;version="1.0.2", + javax.xml.stream.util;version="1.0.2" Export-Package: com.sun.xml.bind; uses:="javax.xml.bind.annotation.adapters, javax.xml.namespace, @@ -31,7 +38,6 @@ Export-Package: com.sun.xml.bind; org.xml.sax, com.sun.xml.bind.v2.runtime, javax.xml.bind.attachment, - javax.xml.stream, javax.xml.transform, com.sun.xml.bind.v2.model.annotation, javax.xml.bind", @@ -60,6 +66,13 @@ Export-Package: com.sun.xml.bind; com.sun.xml.bind.v2.schemagen.episode, com.sun.xml.bind.v2.schemagen.xmlschema, com.sun.xml.bind.v2.util, + javax.xml.bind, + javax.xml.bind.annotation, + javax.xml.bind.annotation.adapters, + javax.xml.bind.helpers, + javax.xml.stream;version="1.0.2", + javax.xml.stream.events;version="1.0.2", + javax.xml.stream.util;version="1.0.2", jp.go.aist.rtm.toolscommon.profiles.util;uses:="junit.framework", org.openrtp.namespaces.rtc.version02;uses:="javax.xml.bind,javax.xml.datatype", org.openrtp.namespaces.rtc.version03;uses:="javax.xml.bind,javax.xml.datatype", diff --git a/jp.go.aist.rtm.toolscommon.profiles/build.properties b/jp.go.aist.rtm.toolscommon.profiles/build.properties index bc7751303..ee89e6ba0 100644 --- a/jp.go.aist.rtm.toolscommon.profiles/build.properties +++ b/jp.go.aist.rtm.toolscommon.profiles/build.properties @@ -8,18 +8,22 @@ bin.includes = .,\ plugin.xml,\ plugin.properties,\ lib/jyaml-1.3.jar,\ - lib/jaxb-impl.jar,\ jyaml.yml,\ schema/,\ lib/slf4j-api-1.7.13.jar,\ lib/logback-classic-1.1.3.jar,\ lib/logback-core-1.1.3.jar,\ - lib/jackson-annotations-2.9.5.jar,\ - lib/jackson-core-2.9.5.jar,\ - lib/jackson-databind-2.9.5.jar,\ COPYRIGHT,\ about.html,\ - epl-1.0.txt + epl-1.0.txt,\ + lib/istack-commons-runtime-3.0.7.jar,\ + lib/javax.activation-api-1.2.0.jar,\ + lib/jaxb-api-2.3.1.jar,\ + lib/jaxb-runtime-2.3.1.jar,\ + lib/jackson-databind-2.9.5.jar,\ + lib/jackson-annotations-2.9.5.jar,\ + lib/jackson-core-2.9.5.jar,\ + lib/stax-api-1.0-2.jar jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/jp.go.aist.rtm.toolscommon.profiles/lib/istack-commons-runtime-3.0.7.jar b/jp.go.aist.rtm.toolscommon.profiles/lib/istack-commons-runtime-3.0.7.jar new file mode 100644 index 000000000..2fe5b8262 Binary files /dev/null and b/jp.go.aist.rtm.toolscommon.profiles/lib/istack-commons-runtime-3.0.7.jar differ diff --git a/jp.go.aist.rtm.toolscommon.profiles/lib/javax.activation-api-1.2.0.jar b/jp.go.aist.rtm.toolscommon.profiles/lib/javax.activation-api-1.2.0.jar new file mode 100644 index 000000000..986c36509 Binary files /dev/null and b/jp.go.aist.rtm.toolscommon.profiles/lib/javax.activation-api-1.2.0.jar differ diff --git a/jp.go.aist.rtm.toolscommon.profiles/lib/jaxb-api-2.3.1.jar b/jp.go.aist.rtm.toolscommon.profiles/lib/jaxb-api-2.3.1.jar new file mode 100644 index 000000000..456586547 Binary files /dev/null and b/jp.go.aist.rtm.toolscommon.profiles/lib/jaxb-api-2.3.1.jar differ diff --git a/jp.go.aist.rtm.toolscommon.profiles/lib/jaxb-runtime-2.3.1.jar b/jp.go.aist.rtm.toolscommon.profiles/lib/jaxb-runtime-2.3.1.jar new file mode 100644 index 000000000..0b9ef67c4 Binary files /dev/null and b/jp.go.aist.rtm.toolscommon.profiles/lib/jaxb-runtime-2.3.1.jar differ diff --git a/jp.go.aist.rtm.toolscommon.profiles/lib/stax-api-1.0-2.jar b/jp.go.aist.rtm.toolscommon.profiles/lib/stax-api-1.0-2.jar new file mode 100644 index 000000000..015169dc7 Binary files /dev/null and b/jp.go.aist.rtm.toolscommon.profiles/lib/stax-api-1.0-2.jar differ diff --git a/jp.go.aist.rtm.toolscommon/.classpath b/jp.go.aist.rtm.toolscommon/.classpath index 9b8a94d4b..3107d3f85 100644 --- a/jp.go.aist.rtm.toolscommon/.classpath +++ b/jp.go.aist.rtm.toolscommon/.classpath @@ -1,5 +1,7 @@ + + diff --git a/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF b/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF index 2b566139d..9fb3bd103 100644 --- a/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF +++ b/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF @@ -5,8 +5,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: jp.go.aist.rtm.toolscommon;singleton:=true Bundle-Version: 2.0.0 -Bundle-ClassPath: ., - lib/commons-lang-2.2.jar +Bundle-ClassPath: lib/commons-lang-2.2.jar, + lib/jakarta.transaction-api-2.0.1.jar, + lib/openjdk-orb-10.1.1.Final.jar, + . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -45,7 +47,13 @@ Export-Package: OpenRTM, org.apache.commons.lang.math, org.apache.commons.lang.mutable, org.apache.commons.lang.text, - org.apache.commons.lang.time + org.apache.commons.lang.time, + org.omg.CORBA, + org.omg.CORBA.portable, + org.omg.CosNaming, + org.omg.CosNaming.NamingContextExtPackage, + org.omg.CosNaming.NamingContextPackage, + org.omg.PortableServer Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, diff --git a/jp.go.aist.rtm.toolscommon/build.properties b/jp.go.aist.rtm.toolscommon/build.properties index 00b8f6206..8f84fd120 100644 --- a/jp.go.aist.rtm.toolscommon/build.properties +++ b/jp.go.aist.rtm.toolscommon/build.properties @@ -13,7 +13,9 @@ bin.includes = .,\ lib/,\ COPYRIGHT,\ about.html,\ - epl-1.0.txt + epl-1.0.txt,\ + lib/jakarta.transaction-api-2.0.1.jar,\ + lib/openjdk-orb-10.1.1.Final.jar jars.compile.order = . source.. = src/ output.. = bin/ diff --git a/jp.go.aist.rtm.toolscommon/lib/jakarta.transaction-api-2.0.1.jar b/jp.go.aist.rtm.toolscommon/lib/jakarta.transaction-api-2.0.1.jar new file mode 100644 index 000000000..b1e7da4be Binary files /dev/null and b/jp.go.aist.rtm.toolscommon/lib/jakarta.transaction-api-2.0.1.jar differ diff --git a/jp.go.aist.rtm.toolscommon/lib/openjdk-orb-10.1.1.Final.jar b/jp.go.aist.rtm.toolscommon/lib/openjdk-orb-10.1.1.Final.jar new file mode 100644 index 000000000..ce093bb1f Binary files /dev/null and b/jp.go.aist.rtm.toolscommon/lib/openjdk-orb-10.1.1.Final.jar differ diff --git a/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/corba/CorbaUtil.java b/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/corba/CorbaUtil.java index 9535799de..67abc3a70 100644 --- a/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/corba/CorbaUtil.java +++ b/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/corba/CorbaUtil.java @@ -26,6 +26,36 @@ public class CorbaUtil { private static final Logger LOGGER = LoggerFactory .getLogger(CorbaUtil.class); + private static ORB orb = null; + + private static Properties createProps() { + Properties props = new Properties(); + + props.put("org.omg.CORBA.ORBClass", "com.sun.corba.se.impl.orb.ORBImpl"); + props.put("org.omg.CORBA.ORBSingletonClass", "com.sun.corba.se.impl.orb.ORBSingleton"); + + return props; + } + + public static synchronized ORB getOrb() { + if (orb == null) { + try { + LOGGER.info("Initializing ORB with openjdk-orb..."); + orb = ORB.init(new String[] {}, createProps()); + if (orb != null) { + try { + Method m = orb.getClass().getMethod("getLogger", String.class); + java.util.logging.Logger l = (java.util.logging.Logger) m.invoke(orb, ""); + l.setLevel(java.util.logging.Level.SEVERE); + } catch (Exception e) { + LOGGER.trace("ORB getLogger not supported, skipping."); + } + } + } catch(Exception ex) { + } + } + return orb; + } /** * 対象のNamingContextExtから子供のBindingをListとして返す * @@ -54,50 +84,6 @@ public static List getBindingList(NamingContext target) { return result; } - /** - * ORBオブジェクト - */ -// private static ORB orb = ORB.init(new String[] { -// "-ORBTCPReadTimeouts", "1:60000:300:1" } -// , null); - - // omniORBのオプションだろう. JDKのCORBA実装にはない -// "-ORBclientCallTimeOutPeriod", -// String.valueOf(ToolsCommonPreferenceManager.getInstance().getDefaultTimeout( -// ToolsCommonPreferenceManager.DEFAULT_TIMEOUT_PERIOD) - private static ORB orb = ORB.init(new String[] {}, createProps()); - static { - try { - Method declaredMethod = orb.getClass().getMethod("getLogger", - String.class); - java.util.logging.Logger logger = (java.util.logging.Logger) declaredMethod - .invoke(orb, ""); - logger.setLevel(java.util.logging.Level.SEVERE); - } catch (Exception e) { - LOGGER.error("Fail to get logger", e); - } - } - - /** - * ORBオブジェクトを取得する - * - * @return ORB - */ - public static ORB getOrb() { - return orb; - } - - private static Properties createProps() { - setConnectionTimeout(); - - ToolsCommonPreferenceManager.getInstance().addPropertyChangeListener(createListner()); - - Properties props = new Properties(); - props.put("com.sun.CORBA.transport.ORBSocketFactoryClass" - , "jp.go.aist.rtm.toolscommon.corba.TimeoutCorbaORBSocketFactory"); - return props; - } - private static void setConnectionTimeout() { int defaultTimeout = ToolsCommonPreferenceManager.getInstance().getDefaultTimeout( ToolsCommonPreferenceManager.DEFAULT_TIMEOUT_PERIOD); @@ -121,7 +107,7 @@ public void propertyChange(PropertyChangeEvent evt) { * @return CORBAオブジェクト */ public static org.omg.CORBA.Object stringToObject(String str) { - return orb.string_to_object(str); + return getOrb().string_to_object(str); } /** diff --git a/org.iso.iso22166.part202.profile/.classpath b/org.iso.iso22166.part202.profile/.classpath index ea1fd7165..db79d0c37 100644 --- a/org.iso.iso22166.part202.profile/.classpath +++ b/org.iso.iso22166.part202.profile/.classpath @@ -1,6 +1,5 @@ - diff --git a/org.iso.iso22166.part202.profile/META-INF/MANIFEST.MF b/org.iso.iso22166.part202.profile/META-INF/MANIFEST.MF index 90a8b608b..d5375dbdc 100644 --- a/org.iso.iso22166.part202.profile/META-INF/MANIFEST.MF +++ b/org.iso.iso22166.part202.profile/META-INF/MANIFEST.MF @@ -6,8 +6,7 @@ Bundle-Version: 1.0.0 Automatic-Module-Name: org.iso.iso22166.part202.profile Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-ClassPath: ., - lib/jaxb-impl.jar +Bundle-ClassPath: . Export-Package: jp.ac.meijo_u.iso22166_part202.util, org.iso.iso22166.part202.profile Require-Bundle: jp.go.aist.rtm.toolscommon.profiles;bundle-version="2.0.0" diff --git a/org.iso.iso22166.part202.profile/build.properties b/org.iso.iso22166.part202.profile/build.properties index d52f8e799..cf2fe7841 100644 --- a/org.iso.iso22166.part202.profile/build.properties +++ b/org.iso.iso22166.part202.profile/build.properties @@ -2,7 +2,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - lib/jaxb-impl.jar,\ plugin.properties,\ plugin.xml,\ schema/,\ diff --git a/org.iso.iso22166.part202.profile/lib/jaxb-impl.jar b/org.iso.iso22166.part202.profile/lib/jaxb-impl.jar deleted file mode 100644 index 8dcbdc5b7..000000000 Binary files a/org.iso.iso22166.part202.profile/lib/jaxb-impl.jar and /dev/null differ diff --git a/org.iso.iso22166.part202.profile/src/jp/ac/meijo_u/iso22166_part202/util/ISO2RTCProfileHandler.java b/org.iso.iso22166.part202.profile/src/jp/ac/meijo_u/iso22166_part202/util/ISO2RTCProfileHandler.java index c236c4f24..ca9aeddcf 100644 --- a/org.iso.iso22166.part202.profile/src/jp/ac/meijo_u/iso22166_part202/util/ISO2RTCProfileHandler.java +++ b/org.iso.iso22166.part202.profile/src/jp/ac/meijo_u/iso22166_part202/util/ISO2RTCProfileHandler.java @@ -336,7 +336,7 @@ private void createDataPort(ObjectFactory factory, RtcProfile result, Variable e dataPort.setComment(getTargetNVValue("comment", nvs)); dataPort.setVariableName(getTargetNVValue("variableName", nvs)); try { - dataPort.setPosition(Position.valueOf(getTargetNVValue("position", nvs))); + dataPort.setPosition(Position.fromValue(getTargetNVValue("position", nvs))); } catch (Exception e) { } @@ -391,7 +391,7 @@ private void convertServices(SIM source, ObjectFactory factory, RtcProfile resul servicePort.setComment(getTargetNVValue("comment", nvs)); try { - servicePort.setPosition(Position.valueOf(getTargetNVValue("position", nvs))); + servicePort.setPosition(Position.fromValue(getTargetNVValue("position", nvs))); } catch (Exception e) { }