summaryrefslogtreecommitdiff
path: root/src/com/p4square/grow
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/p4square/grow')
-rw-r--r--src/com/p4square/grow/GrowProcessComponent.java7
-rw-r--r--src/com/p4square/grow/frontend/SurveyPageResource.java5
2 files changed, 5 insertions, 7 deletions
diff --git a/src/com/p4square/grow/GrowProcessComponent.java b/src/com/p4square/grow/GrowProcessComponent.java
index eb92840..29da766 100644
--- a/src/com/p4square/grow/GrowProcessComponent.java
+++ b/src/com/p4square/grow/GrowProcessComponent.java
@@ -56,8 +56,8 @@ public class GrowProcessComponent extends Component {
// Authenticated access to the backend
BackendVerifier verifier = new BackendVerifier(backend.getUserRecordProvider());
- ChallengeAuthenticator auth = new ChallengeAuthenticator(getContext(), false,
- ChallengeScheme.HTTP_BASIC, BACKEND_REALM, verifier);
+ ChallengeAuthenticator auth = new ChallengeAuthenticator(getContext().createChildContext(),
+ false, ChallengeScheme.HTTP_BASIC, BACKEND_REALM, verifier);
auth.setNext(backend);
getDefaultHost().attach("/backend", auth);
}
@@ -87,9 +87,6 @@ public class GrowProcessComponent extends Component {
// Start the HTTP Server
final GrowProcessComponent component = new GrowProcessComponent();
component.getServers().add(Protocol.HTTP, 8085);
- component.getClients().add(Protocol.HTTP);
- component.getClients().add(Protocol.HTTPS);
- component.getClients().add(Protocol.FILE);
//component.getClients().add(new Client(null, Arrays.asList(Protocol.HTTPS), "org.restlet.ext.httpclient.HttpClientHelper"));
// Static content
diff --git a/src/com/p4square/grow/frontend/SurveyPageResource.java b/src/com/p4square/grow/frontend/SurveyPageResource.java
index 07bc73c..313fb7b 100644
--- a/src/com/p4square/grow/frontend/SurveyPageResource.java
+++ b/src/com/p4square/grow/frontend/SurveyPageResource.java
@@ -33,7 +33,6 @@ import com.p4square.grow.model.UserRecord;
import com.p4square.grow.provider.DelegateProvider;
import com.p4square.grow.provider.JsonEncodedProvider;
import com.p4square.grow.provider.Provider;
-import com.p4square.grow.provider.QuestionProvider;
/**
* SurveyPageResource handles rendering the survey and processing user's answers.
@@ -71,7 +70,9 @@ public class SurveyPageResource extends FreeMarkerPageResource {
}
mJsonClient = new JsonRequestClient(getContext().getClientDispatcher());
- mQuestionProvider = new QuestionProvider<String>(new JsonRequestProvider<Question>(getContext().getClientDispatcher(), Question.class)) {
+ mQuestionProvider = new DelegateProvider<String, String, Question>(
+ new JsonRequestProvider<Question>(getContext().getClientDispatcher(),
+ Question.class)) {
@Override
public String makeKey(String questionId) {
return getBackendEndpoint() + "/assessment/question/" + questionId;