チェンジセット 27
- コミット日時:
- 2008/11/04 13:29:32 (3 年前)
- ファイル:
-
- trunk/org.intra_mart.jst.server.generic.resin/META-INF/MANIFEST.MF (更新) (2 diffs)
- trunk/org.intra_mart.jst.server.generic.resin/dest/org.intra_mart.jst.server.generic.resin_1.0.2.jar (追加)
- trunk/org.intra_mart.jst.server.generic.resin/plugin.xml (更新) (2 diffs)
- trunk/org.intra_mart.jst.server.generic.resin/src/org/intra_mart/jst/server/generic/resin/ResinServerBehaviour.java (更新) (3 diffs)
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
trunk/org.intra_mart.jst.server.generic.resin/META-INF/MANIFEST.MF
r26 r27 4 4 Bundle-Localization: plugin 5 5 Bundle-SymbolicName: org.intra_mart.jst.server.generic.resin;singleton:=true 6 Bundle-Version: 1.0. 16 Bundle-Version: 1.0.2 7 7 Require-Bundle: org.eclipse.debug.core, 8 8 org.eclipse.jst.server.core, … … 10 10 org.eclipse.jst.server.generic.core, 11 11 org.eclipse.wst.common.project.facet.ui;bundle-version="1.3.0", 12 org.eclipse.jst.server.generic.ui;bundle-version="1.0.305" 12 org.eclipse.jst.server.generic.ui;bundle-version="1.0.305", 13 org.eclipse.jst.common.project.facet.core;bundle-version="1.3.1" 13 14 utionEnvironment: J2SE-1.5 14 15 Bundle-Vendor: %providerName trunk/org.intra_mart.jst.server.generic.resin/plugin.xml
r26 r27 28 28 </extension> 29 29 30 <!--31 behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"32 -->33 30 <extension point="org.eclipse.wst.server.core.serverTypes"> 34 31 <serverType … … 132 129 <extension point="org.eclipse.wst.common.project.facet.ui.images"> 133 130 <image runtime-component-type="org.intra_mart.jst.server.generic.runtime.resin" 134 path="icons/obj16/resin. resin"/>131 path="icons/obj16/resin.png"/> 135 132 </extension> 136 133 trunk/org.intra_mart.jst.server.generic.resin/src/org/intra_mart/jst/server/generic/resin/ResinServerBehaviour.java
r21 r27 52 52 53 53 /** 54 * tools.jar����X�p�X�ɒlj� 54 * setupLaunchClasspath.<br /> 55 * Resin起動前にtools.jarをクラスパスに追加します。<br /> 56 * Eclipse上で設定されているInstalled JREは、JDKが指定されている必要があります。 55 57 * 58 * @param workingCopy 59 * workingCopy. 60 * @param vmInstall 61 * vmInstall. 62 * @param classPathList 63 * classPathList. 56 64 * @see org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour#setupLaunchClasspath(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy, 57 65 * org.eclipse.jdt.launching.IVMInstall, java.util.List) 58 66 */ 59 67 @SuppressWarnings("unchecked") 60 protected void setupLaunchClasspath( 61 ILaunchConfigurationWorkingCopy workingCopy, IVMInstall vmInstall, 62 List classPath) { 68 protected void setupLaunchClasspath(ILaunchConfigurationWorkingCopy workingCopy, IVMInstall vmInstall, List classPathList) { 63 69 64 classPath 65 .add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path( 66 vmInstall.getInstallLocation().getAbsolutePath() 67 + File.separator + "lib" + File.separator 68 + "tools.jar"))); 69 super.setupLaunchClasspath(workingCopy, vmInstall, classPath); 70 classPathList.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(vmInstall.getInstallLocation().getAbsolutePath() + File.separator + "lib" + File.separator + "tools.jar"))); 71 super.setupLaunchClasspath(workingCopy, vmInstall, classPathList); 70 72 } 71 73 74 /** 75 * 起動時にresin.xmlファイルの生成を行います. 76 * 77 * @param launch 78 * launch. 79 * @param launchMode 80 * launchMode. 81 * @param monitor 82 * monitor. 83 * @see org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour#setupLaunch(org.eclipse.debug.core.ILaunch, 84 * java.lang.String, org.eclipse.core.runtime.IProgressMonitor) 85 */ 72 86 @Override 73 protected void setupLaunch(ILaunch launch, String launchMode, 74 IProgressMonitor monitor) throws CoreException { 87 protected void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException { 75 88 76 89 createConfigFile(); … … 79 92 } 80 93 94 /** 95 * プログラム引数にresin設定ファイル(-conf resin.xml)を追加します. 96 * 97 * @return program arguments. 98 * @seeorg.eclipse.jst.server.generic.core.internal.GenericServerBehaviour# 99 * getProgramArguments 100 * ( 101 * ) 102 */ 81 103 @Override 82 104 protected String getProgramArguments() { 83 105 84 return super.getProgramArguments() + "-conf conf/" 85 + getServerName().replaceAll(" ", "_") + ".xml"; 106 return super.getProgramArguments() + "-conf conf/" + getServerName().replaceAll(" ", "_") + ".xml"; 86 107 } 87 108 109 /** 110 * サーバ名を取得します. 111 * 112 * @return server name. 113 */ 88 114 private String getServerName() { 89 115 return getServer().getName(); 90 116 } 91 117 92 private IPath getServerLocationPath() { 118 /** 119 * サーバロケーションを取得します. 120 * 121 * @return server location. 122 */ 123 private IPath getServerLocation() { 93 124 return getRuntimeDelegate().getRuntime().getLocation(); 94 125 } 95 126 127 /** 128 * 設定ファイルを取得します. 129 * 130 * @return config file. 131 */ 96 132 private File getConfigFile() { 97 return new File(getServerLocationPath().toFile(), "/conf/" 98 + getServerName().replaceAll(" ", "_") + ".xml"); 133 return new File(getServerLocation().toFile(), "/conf/" + getServerName().replaceAll(" ", "_") + ".xml"); 99 134 } 100 135 136 /** 137 * 設定ファイルを作成します.<br /> 138 * 既に設定ファイルが存在する場合は作成しません。 139 */ 101 140 private void createConfigFile() { 102 141 … … 112 151 try { 113 152 out = new BufferedOutputStream(new FileOutputStream(file)); 114 in = ResinServerBehaviour.class 115 .getResourceAsStream("/servers/resin32.xml"); 153 in = ResinServerBehaviour.class.getResourceAsStream("/servers/resin32.xml"); 116 154 117 155 int size = 0;
