Skip to content

增加fixflow-core和expand项目对OSGI项目的的支持 #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wyc20131204 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

增加fixflow-core和expand项目对OSGI项目的的支持 #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions fixflow-core/src/com/founder/fix/fixflow/core/impl/ProcessEngineConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

import org.dom4j.Document;
import org.dom4j.Element;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
Expand Down Expand Up @@ -275,9 +276,16 @@ private void initRulesConfig() {
for (RulesResource rulesResource : rulesResources) {
String classPath = rulesResource.getSrc();
Document document = null;
String filePath = this.getClass().getClassLoader().getResource(classPath).toString();
try {
InputStream in = ReflectUtil.getResourceAsStream(classPath);
document = XmlUtil.read(in);
//用于处理osgi项目文件加载
if(filePath.startsWith("bundleresource")){
InputStream in = new FileInputStream(FileLocator.toFileURL(this.getClass().getClassLoader().getResource(classPath)).toString().substring(6));
document = XmlUtil.read(in);
}else{
InputStream in = ReflectUtil.getResourceAsStream(classPath);
document = XmlUtil.read(in);
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
Expand Down Expand Up @@ -483,16 +491,24 @@ private void initDataVariableConfig() {
String filePath = this.getClass().getClassLoader().getResource(classPath).toString();
Resource resource = null;
try {
if (!filePath.startsWith("jar")) {
filePath = java.net.URLDecoder.decode(ReflectUtil.getResource(classPath).getFile(), "utf-8");
resource = resourceSet.createResource(URI.createFileURI(filePath));
} else {
resource = resourceSet.createResource(URI.createURI(filePath));
//用于处理osgi项目文件加载
if(filePath.startsWith("bundleresource")){
resource = resourceSet.createResource(URI.createURI(FileLocator.toFileURL(this.getClass().getClassLoader().getResource(classPath)).toString()));
}
else if(filePath.startsWith("jar")) {
resource = resourceSet.createResource(URI.createURI(filePath));
}
else{
filePath = java.net.URLDecoder.decode(ReflectUtil.getResource(classPath).getFile(), "utf-8");
resource = resourceSet.createResource(URI.createFileURI(filePath));
}

} catch (UnsupportedEncodingException e2) {
e2.printStackTrace();
throw new FixFlowException("流程配置文件加载失败！", e2);
}catch (IOException e) {
e.printStackTrace();
throw new FixFlowException("bundle项目文件路径获取失败！", e);
}

// register package in local resource registry
Expand Down Expand Up @@ -557,16 +573,24 @@ protected void initEmfFile() {
String filePath = this.getClass().getClassLoader().getResource(classPath).toString();
Resource resource = null;
try {
if (!filePath.startsWith("jar")) {
//用于处理osgi项目文件加载
if(filePath.startsWith("bundleresource")){
resource = resourceSet.createResource(URI.createURI(FileLocator.toFileURL(this.getClass().getClassLoader().getResource(classPath)).toString()));
}
else if(filePath.startsWith("jar")) {
resource = resourceSet.createResource(URI.createURI(filePath));
}
else{
filePath = java.net.URLDecoder.decode(ReflectUtil.getResource(classPath).getFile(), "utf-8");
resource = resourceSet.createResource(URI.createFileURI(filePath));
} else {
resource = resourceSet.createResource(URI.createURI(filePath));
}

} catch (UnsupportedEncodingException e2) {
e2.printStackTrace();
throw new FixFlowException("流程配置文件加载失败！", e2);
}catch (IOException e) {
e.printStackTrace();
throw new FixFlowException("bundle项目文件路径获取失败！", e);
}

// register package in local resource registry
Expand Down