You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2004/05/14 11:12:07 UTC
cvs commit: jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/config WebXml.java
pnever 2004/05/14 02:12:07
Modified: proposals/tamino/src/store/org/apache/slide/store/tamino/store
Tag: TWS421_BRANCH XChildStore.java
proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/search
Tag: TWS421_BRANCH XBasicQueryImpl.java
proposals/tamino/src/store/org/apache/slide/store/tamino/tools/config
Tag: TWS421_BRANCH WebXml.java
Log:
Monor changes
Revision Changes Path
No revision
No revision
1.1.4.2 +5 -6 jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XChildStore.java
Index: XChildStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XChildStore.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- XChildStore.java 20 Apr 2004 11:12:29 -0000 1.1.4.1
+++ XChildStore.java 14 May 2004 09:12:07 -0000 1.1.4.2
@@ -300,8 +300,7 @@
if ( (dbSession instanceof XDbSession) ) {
// Catalina catalina;
- String context = System.getProperty("webapp.context", "taminowebdavserver");
- System.out.println("@@@ webapp.context: "+context);
+ String context = System.getProperty("webapp.context", "taminowebdavserver");
// try {
// catalina = Catalina.create();
No revision
No revision
1.1.4.1 +5 -4 jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/search/XBasicQueryImpl.java
Index: XBasicQueryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/search/XBasicQueryImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XBasicQueryImpl.java 25 Mar 2004 16:18:01 -0000 1.1
+++ XBasicQueryImpl.java 14 May 2004 09:12:07 -0000 1.1.4.1
@@ -67,6 +67,7 @@
public XBasicQueryImpl () {
notNormalizer = new XNotNormalizer ();
xpathPool = new XPathPool (this);
+ expressionFactory = new XBasicExpressionFactory();
}
/**
No revision
No revision
1.2.2.1 +16 -5 jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/config/WebXml.java
Index: WebXml.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/config/WebXml.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- WebXml.java 14 Apr 2004 11:56:02 -0000 1.2
+++ WebXml.java 14 May 2004 09:12:07 -0000 1.2.2.1
@@ -64,6 +64,7 @@
private static final String WEB_INF = "WEB-INF";
private static final String SECURITY_CONSTRAINT = "security-constraint";
private static final String LOGIN_CONFIG = "login-config";
+ private static final String SECURITY_ROLE = "security-role";
private static final String SEC_TEMP_FILE = "SecurityConstraints.xml";
private static final String ETC = "etc";
@@ -105,7 +106,7 @@
PublicIdResolver er = new PublicIdResolver();
er.map( PublicIdResolver.WEB_APP_DTD_PUBLID_ID, PublicIdResolver.WEB_APP_DTD_JAVAPATH );
webBuilder.setEntityResolver( er );
- webBuilder.setValidation(true);
+ webBuilder.setValidation(false);
this.doc = webBuilder.build( file );
}
catch( JDOMException x ) {
@@ -243,6 +244,7 @@
private void doRemoveSecurity() throws XException {
doRemoveSecurityConstrain();
doRemoveLoginConfig();
+ doRemoveSecurityRole();
}
private void doAddSecurity() throws XException {
@@ -253,9 +255,13 @@
Element webRoot = getRootElement();
Element secCon = secTempRoot.getChild(SECURITY_CONSTRAINT);
Element secLogin = secTempRoot.getChild(LOGIN_CONFIG);
+ Element secRole = secTempRoot.getChild(SECURITY_ROLE);
// add SECURITY_CONSTRAINT and LOGIN_CONFIG
webRoot.addContent((Element)secCon.clone());
webRoot.addContent((Element)secLogin.clone());
+ if (secRole != null) {
+ webRoot.addContent((Element)secRole.clone());
+ }
}
private void doRemoveSecurityConstrain() throws XException {
@@ -266,6 +272,11 @@
private void doRemoveLoginConfig() throws XException {
Element root = getRootElement();
root.removeChild(LOGIN_CONFIG);
+ }
+
+ private void doRemoveSecurityRole() throws XException {
+ Element root = getRootElement();
+ root.removeChild(SECURITY_ROLE);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org