projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt CMS Web to new assembly approach.
[lgpl/argeo-commons.git]
/
org.argeo.cms.ui
/
src
/
org
/
argeo
/
cms
/
util
/
SimpleApp.java
diff --git
a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
index 5b0e1b779cf991ea41cb213cb7b120e893d1419b..327438b56c58b04690fa5321bf644756d93ed472 100644
(file)
--- a/
org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
+++ b/
org.argeo.cms.ui/src/org/argeo/cms/util/SimpleApp.java
@@
-26,6
+26,7
@@
import org.argeo.cms.ui.CmsUiProvider;
import org.argeo.cms.ui.LifeCycleUiProvider;
import org.argeo.jcr.JcrUtils;
import org.argeo.node.NodeConstants;
import org.argeo.cms.ui.LifeCycleUiProvider;
import org.argeo.jcr.JcrUtils;
import org.argeo.node.NodeConstants;
+import org.argeo.node.NodeUtils;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.Application;
import org.eclipse.rap.rwt.application.Application.OperationMode;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.Application;
import org.eclipse.rap.rwt.application.Application.OperationMode;
@@
-147,8
+148,8
@@
public class SimpleApp implements CmsConstants, ApplicationConfiguration {
log.debug("Theme " + themeId);
for (String css : cssLst) {
application.addStyleSheet(themeId, css, styleSheetRL);
log.debug("Theme " + themeId);
for (String css : cssLst) {
application.addStyleSheet(themeId, css, styleSheetRL);
- if (log.is
Trace
Enabled())
- log.
trace
(" CSS " + css);
+ if (log.is
Debug
Enabled())
+ log.
debug
(" CSS " + css);
}
}
}
}
@@
-168,7
+169,8
@@
public class SimpleApp implements CmsConstants, ApplicationConfiguration {
public void init() throws RepositoryException {
Session session = null;
try {
public void init() throws RepositoryException {
Session session = null;
try {
- session = JcrUtils.loginOrCreateWorkspace(repository, workspace);
+ session = NodeUtils.openDataAdminSession(repository, workspace);
+ // session = JcrUtils.loginOrCreateWorkspace(repository, workspace);
VersionManager vm = session.getWorkspace().getVersionManager();
JcrUtils.mkdirs(session, jcrBasePath);
session.save();
VersionManager vm = session.getWorkspace().getVersionManager();
JcrUtils.mkdirs(session, jcrBasePath);
session.save();